summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-06-02 12:22:14 +1000
committerDave Airlie <airlied@linux.ie>2006-06-02 12:22:14 +1000
commit6812b5382077e5d3f421aceeeb2f337e9b3f570e (patch)
tree69fa006bad423d4945cd23fb195ffa277ade23c0
parentf97895efd5532cca145b6f224f9615739b1e8f26 (diff)
intel: fix VT switch DRI locking
The DRI locking is incorrect at VT switch, due to reference counting inside the driver. Just call the DRI directly.
-rw-r--r--src/i830_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 5462d6cf..0f5c66cb 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -5279,7 +5279,7 @@ I830BIOSLeaveVT(int scrnIndex, int flags)
#ifdef XF86DRI
if (pI830->directRenderingOpen) {
- I830DRILock(pScrn);
+ DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
drmCtlUninstHandler(pI830->drmSubFD);
}
@@ -5611,7 +5611,7 @@ I830BIOSEnterVT(int scrnIndex, int flags)
DO_RING_IDLE();
DPRINTF(PFX, "calling dri unlock\n");
- I830DRIUnlock(pScrn);
+ DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
}
pI830->LockHeld = 0;
}