xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 1b9e82b4b59dd50c1b057f58d71d5c04dcc648a7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jul 26 08:29:36 2011 +0100

    sna: Revert enabling scan-line wait on SNB
    
    Hanging the machine does indeed prevent video tearing. Just not quite
    what the user expected...
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39497
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 5abe540..0809eba 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2089,6 +2089,10 @@ sna_wait_for_scanline(struct sna *sna,
 	Bool full_height;
 	int y1, y2, pipe;
 
+	/* XXX WAIT_EVENT is still causing hangs on SNB */
+	if (sna->kgem.gen >= 60)
+		return false;
+
 	if (!pixmap_is_scanout(pixmap))
 		return false;