diff -up xf86-video-intel-2.1.1/src/i830_video.c.da xf86-video-intel-2.1.1/src/i830_video.c
--- xf86-video-intel-2.1.1/src/i830_video.c.da	2007-10-15 21:30:57.000000000 +1000
+++ xf86-video-intel-2.1.1/src/i830_video.c	2007-10-15 21:31:21.000000000 +1000
@@ -2921,6 +2921,7 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, B
 	 */
 	I830StopVideo(pScrn, pPriv, TRUE);
 	pPriv->overlayOK = FALSE;
+	pPriv->current_crtc = NULL;
 	pPriv->oneLineMode = FALSE;
     }
 }