xf86-video-intel: src/intel_video.c

[Chris Wilson]

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

New commits:
commit 8784c4f5a1524fb979b00c7ce7981cbc1dcf0ec0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Oct 1 21:40:36 2010 +0100

    video: Disable TextureAdaptor for Sandybridge
    
    The acceleration code does not yet exist, so we try to use gen4 shaders
    which hangs the chip and makes everybody upset. Disable it until such a
    time as support is written for Sandybridge XVideo.
    
    Reported-by: Matthias Hopf <mhopf at suse.de>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30500
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_video.c b/src/intel_video.c
index 9c918d5..a07120f 100644
--- a/src/intel_video.c
+++ b/src/intel_video.c
@@ -363,7 +363,7 @@ void I830InitVideo(ScreenPtr screen)
 	 * supported hardware.
 	 */
 	if (scrn->bitsPerPixel >= 16 &&
-	    (IS_I9XX(intel) || IS_I965G(intel)) &&
+	    (IS_I9XX(intel) || (IS_I965G(intel) && !IS_GEN6(intel))) &&
 	    !intel->use_shadow) {
 		texturedAdaptor = I830SetupImageVideoTextured(screen);
 		if (texturedAdaptor != NULL) {