xf86-video-intel: Branch 'intel-kernelmode' - src/i830_driver.c
Jesse Barnes
jbarnes at kemper.freedesktop.org
Fri May 9 14:52:49 PDT 2008
src/i830_driver.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 1f41a1d79b90f57380bbd20ae34ad49880bbed31
Author: Hong Liu <hong.liu at intel.com>
Date: Thu Apr 24 17:03:31 2008 +0800
intel-kernelmode: fix VT switch crash X server
ring buffer registers can only be accessed when not using
drm kernel modesetting.
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 35368a3..4109d88 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3391,9 +3391,11 @@ I830EnterVT(int scrnIndex, int flags)
if (!pI830->starting) {
I830DRIResume(screenInfo.screens[scrnIndex]);
- i830_refresh_ring(pScrn);
- I830Sync(pScrn);
- DO_RING_IDLE();
+ if (!pI830->use_drm_mode) {
+ i830_refresh_ring(pScrn);
+ I830Sync(pScrn);
+ DO_RING_IDLE();
+ }
DPRINTF(PFX, "calling dri unlock\n");
I830DRIUnlock(pScrn);
@@ -3434,9 +3436,11 @@ I830EnterVT(int scrnIndex, int flags)
I830DRIResume(screenInfo.screens[scrnIndex]);
- i830_refresh_ring(pScrn);
- I830Sync(pScrn);
- DO_RING_IDLE();
+ if (!pI830->use_drm_mode) {
+ i830_refresh_ring(pScrn);
+ I830Sync(pScrn);
+ DO_RING_IDLE();
+ }
sarea->texAge++;
for(i = 0; i < I830_NR_TEX_REGIONS+1 ; i++)
More information about the xorg-commit
mailing list