summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2013-11-09 13:29:34 -0500
committerIan Romanick <ian.d.romanick@intel.com>2013-11-15 13:39:38 -0800
commit6f2877c40d931b693369d1d00186ec23d5ede1e0 (patch)
treef5b7c0fd2ad46cbbbe09a824ee595769f9839056 /src/gallium
parent02d9e1be87f0bb03eae829ae3f56a6c0bee33826 (diff)
nouveau/video: don't try on nv3x
It doesn't work, I don't know why, but no point in hanging people's displays until it gets figured out. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.0" <mesa-stable@lists.freedesktop.org> (cherry picked from commit e8d5d3409c73329dba8678b52a53acf5735f04b1)
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nouveau/nouveau_video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c
index 7deea881a25..7b06e3782bb 100644
--- a/src/gallium/drivers/nouveau/nouveau_video.c
+++ b/src/gallium/drivers/nouveau/nouveau_video.c
@@ -519,7 +519,7 @@ nouveau_create_decoder(struct pipe_context *context,
goto vl;
if (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0)
goto vl;
- if (screen->device->chipset < 0x31 || screen->device->chipset == 0x35)
+ if (screen->device->chipset < 0x40)
goto vl;
dec = CALLOC_STRUCT(nouveau_decoder);
@@ -782,7 +782,7 @@ nouveau_video_buffer_create(struct pipe_context *pipe,
*/
if (templat->buffer_format != PIPE_FORMAT_NV12 || getenv("XVMC_VL") ||
(screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0) ||
- screen->device->chipset < 0x31 || screen->device->chipset == 0x35)
+ screen->device->chipset < 0x40)
return vl_video_buffer_create(pipe, templat);
assert(templat->chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420);