summaryrefslogtreecommitdiff
path: root/src/i830_driver.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-05-06 18:48:20 -0700
committerEric Anholt <eric@anholt.net>2008-05-06 18:57:20 -0700
commit36ec93300926084fb2951d69b001e4c67bc6ff79 (patch)
tree12cf5734e5f99a2d9b7d6d929f8cf683bcef8b12 /src/i830_driver.c
parent0c00a638ef57aa9d6a3047176b0bfad733f781f0 (diff)
Bug #15807: Fix use of the ring while VT-switched, hit by fast user switching.
The fix for flushing at blockhandler with no DRI on 965 was broken and would try to flush the chip even when the driver wasn't in control of the VT. Hilarity ensued.
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r--src/i830_driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index b776ff67..2efad473 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2411,7 +2411,7 @@ I830BlockHandler(int i,
* after the page flipping updates, so there's no need to duplicate
* the effort here.
*/
- if (!pI830->noAccel && !pI830->directRenderingEnabled)
+ if (pScrn->vtSema && !pI830->noAccel && !pI830->directRenderingEnabled)
I830EmitFlush(pScrn);
I830VideoBlockHandler(i, blockData, pTimeout, pReadmask);