Mesa (master): nv50: allow non-nv12 buffers to be created, just pass them through to vl

[Maarten Lankhorst]

Module: Mesa
Branch: master
Commit: a8346a2f52d08233d376db3aa8205d0b2cc74318
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8346a2f52d08233d376db3aa8205d0b2cc74318

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat Aug 17 10:53:09 2013 -0400

nv50: allow non-nv12 buffers to be created, just pass them through to vl

Since we expose non-NV12 formats as supported when there is no decoer
profile selected, make sure that those formats are actually allowed to
be allocated.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Tested-by: Emil Velikov <emil.l.velikov at gmail.com>
Cc: "9.2" <mesa-stable at lists.freedesktop.org>

---

 src/gallium/drivers/nv50/nv84_video.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv84_video.c b/src/gallium/drivers/nv50/nv84_video.c
index 2167b02..8c3c3b7 100644
--- a/src/gallium/drivers/nv50/nv84_video.c
+++ b/src/gallium/drivers/nv50/nv84_video.c
@@ -624,17 +624,13 @@ nv84_video_buffer_create(struct pipe_context *pipe,
    union nouveau_bo_config cfg;
    unsigned bo_size;
 
-   if (getenv("XVMC_VL"))
+   if (getenv("XVMC_VL") || template->buffer_format != PIPE_FORMAT_NV12)
       return vl_video_buffer_create(pipe, template);
 
    if (!template->interlaced) {
       debug_printf("Require interlaced video buffers\n");
       return NULL;
    }
-   if (template->buffer_format != PIPE_FORMAT_NV12) {
-      debug_printf("Must use NV12 format\n");
-      return NULL;
-   }
    if (template->chroma_format != PIPE_VIDEO_CHROMA_FORMAT_420) {
       debug_printf("Must use 4:2:0 format\n");
       return NULL;