summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-02-21 20:36:58 -0800
committerEric Anholt <eric@anholt.net>2009-02-24 12:21:02 -0800
commit97b3ab47c6eec98baf7566e7290c6030934ad956 (patch)
tree5e77f9865f8d68fd969e892920999e7640fd1cc0
parentf3f21a0e45060aa7b333e026938325af133b014c (diff)
Don't do AdjustFrame in KMS mode.
This was hit by xv86vm's SwitchMode path, and for that the CRTC offsets get set at mode setting time anyway. (cherry picked from commit 53108994616d9751ac3a29fd61eb269cfaeab967)
-rw-r--r--src/i830_driver.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index cd00a71e..5a31e82c 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3535,6 +3535,9 @@ i830AdjustFrame(int scrnIndex, int x, int y, int flags)
DPRINTF(PFX, "i830AdjustFrame: y = %d (+ %d), x = %d (+ %d)\n",
x, pI830->xoffset, y, pI830->yoffset);
+ if (pI830->use_drm_mode)
+ return;
+
if (crtc && crtc->enabled)
{
/* Sync the engine before adjust frame */