xf86-video-intel: src/i830_driver.c

[Eric Anholt]

 src/i830_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36ec93300926084fb2951d69b001e4c67bc6ff79
Author: Eric Anholt <eric at anholt.net>
Date:   Tue May 6 18:48:20 2008 -0700

    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.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index b776ff6..2efad47 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);