From ab19439cf4592e4607dc0bfc602aba3d56645a42 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@neko.keithp.com>
Date: Fri, 23 Mar 2007 14:34:27 -0700
Subject: [PATCH] Don't call AdjustFrame on EnterVT.

AdjustFrame is strictly for legacy compatibility; calling it on EnterVT
wrecks crtc positions.
---
 src/i830_driver.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index f41beb0b..624f986c 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2734,7 +2734,7 @@ i830AdjustFrame(int scrnIndex, int x, int y, int flags)
    {
       /* Sync the engine before adjust frame */
       i830WaitSync(pScrn);
-      i830PipeSetBase(crtc, output->initial_x + x, output->initial_y + y);
+      i830PipeSetBase(crtc, crtc->desiredX + x, crtc->desiredY + y);
       crtc->x = output->initial_x + x;
       crtc->y = output->initial_y + y;
    }
@@ -2851,8 +2851,6 @@ I830EnterVT(int scrnIndex, int flags)
    ResetState(pScrn, TRUE);
    SetHWOperatingState(pScrn);
 
-   pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-
 #ifdef XF86DRI
    if (pI830->directRenderingEnabled) {