summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-02-28 17:52:42 +0100
committerMichel Dänzer <michel@tungstengraphics.com>2007-02-28 17:52:42 +0100
commit36cad3fcb65e3dcd88e58e301cd60adb121cb96b (patch)
tree220a48c41205ba898bf14880e64da410168eb08a
parentb5316fb2623e9630cbd58020e0a7c95bf354c587 (diff)
Update vblank pipe setup when setting a mode.
-rw-r--r--src/i830_display.c6
-rw-r--r--src/i830_driver.c4
2 files changed, 3 insertions, 7 deletions
diff --git a/src/i830_display.c b/src/i830_display.c
index 258897ee..04159e73 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -864,6 +864,9 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
OUTREG(dspcntr_reg, dspcntr);
/* Flush the plane changes */
i830PipeSetBase(crtc, x, y);
+#ifdef XF86DRI
+ I830DRISetVBlankInterrupt (pScrn, TRUE);
+#endif
i830WaitForVblank(pScrn);
}
@@ -1041,9 +1044,6 @@ i830SetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, Rotation rotation)
i830DescribeOutputConfiguration(pScrn);
-#ifdef XF86DRI
- I830DRISetVBlankInterrupt (pScrn, TRUE);
-#endif
done:
i830DumpRegs (pScrn);
i830_sdvo_dump(pScrn);
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 3c8ec1a1..9bd70299 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3085,10 +3085,6 @@ I830EnterVT(int scrnIndex, int flags)
i830DumpRegs (pScrn);
i830DescribeOutputConfiguration(pScrn);
-#ifdef XF86DRI
- I830DRISetVBlankInterrupt (pScrn, TRUE);
-#endif
-
ResetState(pScrn, TRUE);
SetHWOperatingState(pScrn);