xf86-video-intel: src/intel_driver.c

[Chris Wilson]

 src/intel_driver.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit c2fac6ca108734dd9566570b15f01cc476fa53dc
Author: Matthias Hopf <mhopf at suse.de>
Date:   Fri Nov 19 04:29:57 2010 +0100

    Don't use hardware acceleration on Sandybridge rev 07 hardware or earlier.
    
    This is known to lock up the GPU even with the workaround in place.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31773
    Signed-off-by: Matthias Hopf <mhopf at suse.de>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_driver.c b/src/intel_driver.c
index e4aecfc..a3d924f 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -496,6 +496,17 @@ static Bool can_accelerate_blt(struct intel_screen_private *intel)
 			return FALSE;
 	}
 
+	if (INTEL_INFO(intel)->gen == 60) {
+		struct pci_device *const device = intel->PciInfo;
+
+		/* Sandybridge rev07 locks up easily, even with the
+		 * BLT ring workaround in place.
+		 * Thus use shadowfb by default.
+		 */
+		if (device->revision < 8)
+		    return FALSE;
+	}
+
 	return TRUE;
 }