xf86-video-intel: Branch 'modesetting' - src/i830_driver.c

[Eric Anholt]

 src/i830_driver.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

New commits:
diff-tree 36bfeb890aeb17a8ee058790dd69b4e9aba644a1 (from 732885c08daaf17034da8f4855d0b957ec3df9d7)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Feb 26 16:58:33 2007 -0800

    Move the initial EnterVT to after we've set up acceleration.
    
    This fixes a crash with initial rotation and EXA due to EXA not being
    initialized in time for the shadow pixmap setup.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4746c72..1dfd7a8 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2579,8 +2579,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
 	 }
       }
    }
-   if (!I830EnterVT(scrnIndex, 0))
-      return FALSE;
 
     if (pScrn->virtualX > pScrn->displayWidth)
 	pScrn->displayWidth = pScrn->virtualX;
@@ -2623,6 +2621,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
       }
    }
 
+   if (!I830EnterVT(scrnIndex, 0))
+      return FALSE;
+
    miInitializeBackingStore(pScreen);
    xf86SetBackingStore(pScreen);
    xf86SetSilkenMouse(pScreen);