summaryrefslogtreecommitdiff
path: root/src/i830_driver.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2006-06-19 13:47:28 -0700
committerKeith Packard <keithp@neko.keithp.com>2006-06-19 13:47:28 -0700
commit8a6edba33213911cc2210b5e903428b81d45862f (patch)
treecf1ff10a7d2ca15319a286ef932dad91dc594acf /src/i830_driver.c
parenta73ab7f0e6e3b0462e05c0031ffd602ed3e2bcd4 (diff)
Set vblank interrupt configuration to match pipe configuration
New i915 drm ioctl (in version 1.5) allows the X server to select which pipe drives vblank interrupts. Use this to drive from the 'preferred' pipe. Yes, per-window vblanks would be nice in a shared fb environment. Maybe someday. (cherry picked from 2fb375b665f4802819b89f2277fd6154006c11ee commit)
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r--src/i830_driver.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index a4b891b6..907b2042 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3826,6 +3826,9 @@ RestoreHWState(ScrnInfoPtr pScrn)
DPRINTF(PFX, "RestoreHWState\n");
+#ifdef XF86DRI
+ I830DRISetVBlankInterrupt (pScrn, FALSE);
+#endif
if (I830IsPrimary(pScrn) && pI830->pipe != pI830->origPipe)
SetBIOSPipe(pScrn, pI830->origPipe);
else
@@ -4411,6 +4414,9 @@ I830VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode)
#endif
#ifdef XF86DRI
+ I830DRISetVBlankInterrupt (pScrn, TRUE);
+#endif
+#ifdef XF86DRI
if (didLock)
I830DRIUnlock(pScrn);
#endif