summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-10-01 21:40:36 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-01 21:45:15 +0100
commit8784c4f5a1524fb979b00c7ce7981cbc1dcf0ec0 (patch)
treed73f10e7631195c2ecb70d87aa7f3ba00da93e09
parent345c963e443ec325f1ff530512a356ddb318ff70 (diff)
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@suse.de> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30500 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/intel_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intel_video.c b/src/intel_video.c
index 9c918d5d..a07120fa 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) {