nouveau/video: don't try on nv3x
authorIlia Mirkin <imirkin@alum.mit.edu>
Sat, 9 Nov 2013 18:29:34 +0000 (13:29 -0500)
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>
Tue, 12 Nov 2013 09:10:54 +0000 (10:10 +0100)
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>
src/gallium/drivers/nouveau/nouveau_video.c

index 7deea881a2556bc338bfee772415c62ab9e48c65..7b06e3782bbdad2762a5f88ca6c1c1bd3bbb818d 100644 (file)
@@ -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);