summaryrefslogtreecommitdiff
path: root/driver/xf86-video-intel/src/uxa
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2014-02-14 19:38:41 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2014-02-14 19:38:41 +0000
commit78192b77bcc1631d33ceca7e29fd5555464d76b2 (patch)
tree3fb94423a0554bca9126e475097cb428c3439cfb /driver/xf86-video-intel/src/uxa
parent31049b1cf3eb649d2eb3d03f85443e0b0d5ef469 (diff)
Update to xf86-video-intel 2.99.910 (aka 3.0RC10) tested by jsg@ and me.
Diffstat (limited to 'driver/xf86-video-intel/src/uxa')
-rw-r--r--driver/xf86-video-intel/src/uxa/intel_video.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/driver/xf86-video-intel/src/uxa/intel_video.c b/driver/xf86-video-intel/src/uxa/intel_video.c
index d1b98d472..01919e37e 100644
--- a/driver/xf86-video-intel/src/uxa/intel_video.c
+++ b/driver/xf86-video-intel/src/uxa/intel_video.c
@@ -354,7 +354,8 @@ void I830InitVideo(ScreenPtr screen)
/* Set up textured video if we can do it at this depth and we are on
* supported hardware.
*/
- if (scrn->bitsPerPixel >= 16 &&
+ if (!intel->force_fallback &&
+ scrn->bitsPerPixel >= 16 &&
INTEL_INFO(intel)->gen >= 030) {
texturedAdaptor = I830SetupImageVideoTextured(screen);
if (texturedAdaptor != NULL) {