diff --git a/src/i830_display.c b/src/i830_display.c
index d4c144ff..7d01c589 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -384,13 +384,13 @@ i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe)
 	temp = INREG(DSPACNTR);
 	OUTREG(DSPACNTR, temp & ~DISPLAY_PLANE_ENABLE);
 
+	/* Wait for vblank for the disable to take effect */
+	i830WaitForVblank(pScrn);
+
 	/* Next, disable display pipes */
 	temp = INREG(PIPEACONF);
 	OUTREG(PIPEACONF, temp & ~PIPEACONF_ENABLE);
 
-	/* Wait for vblank for the disable to take effect */
-	i830WaitForVblank(pScrn);
-
 	OUTREG(FPA0, fp);
 	OUTREG(DPLL_A, dpll);
 	OUTREG(HTOTAL_A, htot);
@@ -416,13 +416,13 @@ i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe)
 	temp = INREG(DSPBCNTR);
 	OUTREG(DSPBCNTR, temp & ~DISPLAY_PLANE_ENABLE);
 
+	/* Wait for vblank for the disable to take effect */
+	i830WaitForVblank(pScrn);
+
 	/* Next, disable display pipes */
 	temp = INREG(PIPEBCONF);
 	OUTREG(PIPEBCONF, temp & ~PIPEBCONF_ENABLE);
 
-	/* Wait for vblank for the disable to take effect */
-	i830WaitForVblank(pScrn);
-
 	OUTREG(FPB0, fp);
 	OUTREG(DPLL_B, dpll);
 	OUTREG(HTOTAL_B, htot);