summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-05-06 18:48:20 -0700
committerZhenyu Wang <zhenyu.z.wang@intel.com>2008-05-07 11:11:46 +0800
commit5749983fc6bae0a845bff0dbdd79c87420dffcf4 (patch)
treec6858e772468025a3afc5b05e35e84f6d986e6d3 /src
parentab0aa8e16c6bec2785006cee09dc1ae93a1988da (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. (cherry picked from commit 36ec93300926084fb2951d69b001e4c67bc6ff79)
Diffstat (limited to 'src')
-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 d31ceb95..0112e1de 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2407,7 +2407,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);