diff --git a/src/i830_display.c b/src/i830_display.c
index a7eafb9..49c214c 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -1257,6 +1265,7 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
 	if ((pipe == 0) && (pI830->quirk_flag & QUIRK_PIPEA_FORCE))
 	    disable_pipe = FALSE;
 	i830_crtc_disable(crtc, disable_pipe);
+	intel_crtc->enabled = FALSE;
 	break;
     }
 
diff --git a/src/i830_driver.c b/src/i830_driver.c
index bd7a32c..26b8694 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2782,9 +2783,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
    }
    i830_init_bufmgr(pScrn);
 
-   if (!pI830->use_drm_mode)
-       I830SwapPipes(pScrn);
-
    pScrn->fbOffset = pI830->front_buffer->offset;
 
    if (!pI830->use_drm_mode) {
@@ -3073,6 +3071,9 @@ I830EnterVT(int scrnIndex, int flags)
 
    /* Get the hardware into a known state if needed */
    if (!pI830->use_drm_mode) {
+
+       I830SwapPipes(pScrn);
+
        /* Disable outputs */
        for (i = 0; i < xf86_config->num_output; i++) {
 	   xf86OutputPtr   output = xf86_config->output[i];