summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-02-26 16:58:33 -0800
committerEric Anholt <eric@anholt.net>2007-02-26 16:58:33 -0800
commit36bfeb890aeb17a8ee058790dd69b4e9aba644a1 (patch)
treec117536ced775ce79fed41db5b39297467360f59
parent732885c08daaf17034da8f4855d0b957ec3df9d7 (diff)
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.
-rw-r--r--src/i830_driver.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4746c72f..1dfd7a83 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2579,8 +2579,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
}
}
- if (!I830EnterVT(scrnIndex, 0))
- return FALSE;
if (pScrn->virtualX > pScrn->displayWidth)
pScrn->displayWidth = pScrn->virtualX;
@@ -2623,6 +2621,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
}
}
+ if (!I830EnterVT(scrnIndex, 0))
+ return FALSE;
+
miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);