summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-06-18 11:57:48 -0700
committerEric Anholt <eric@anholt.net>2007-06-18 11:57:48 -0700
commitacef342c870f3b5b781e48c8bf44739aa5ee8ffa (patch)
treea781bfdc955441dce84369cc2513c3a34cfaae1e
parentfbbb41bc5e03478cb46ee8f64ef68b23ff3fc14b (diff)
Bug #11295: Disable textured video on i915 with framebuffer width too large.
-rw-r--r--src/i830_video.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/i830_video.c b/src/i830_video.c
index 1ee43dd8..43e25bbb 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -569,7 +569,9 @@ I830InitVideo(ScreenPtr pScreen)
/* Set up textured video if we can do it at this depth and we are on
* supported hardware.
*/
- if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(pI830) || IS_I965G(pI830))) {
+ if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(pI830) || IS_I965G(pI830)) &&
+ !(!IS_I965G(pI830) && pScrn->displayWidth > 2048))
+ {
texturedAdaptor = I830SetupImageVideoTextured(pScreen);
if (texturedAdaptor != NULL) {
adaptors[num_adaptors++] = texturedAdaptor;