Ilia Mirkin
2014-May-18 14:16 UTC
[Nouveau] [PATCH] nvc0: maxwell has a new video engine, don't return a decoder object
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c index 5871f59..c9ab13a 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c @@ -77,6 +77,9 @@ nvc0_create_decoder(struct pipe_context *context, if (getenv("XVMC_VL")) return vl_create_decoder(context, templ); + if (screen->device->chipset >= 0x110) + return NULL; + if (templ->entrypoint != PIPE_VIDEO_ENTRYPOINT_BITSTREAM) { debug_printf("%x\n", templ->entrypoint); return NULL; -- 1.8.5.5
Ben Skeggs
2014-May-19 01:06 UTC
[Nouveau] [Mesa-dev] [PATCH] nvc0: maxwell has a new video engine, don't return a decoder object
On Mon, May 19, 2014 at 12:16 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> > --- > src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c > index 5871f59..c9ab13a 100644 > --- a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c > +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c > @@ -77,6 +77,9 @@ nvc0_create_decoder(struct pipe_context *context, > if (getenv("XVMC_VL")) > return vl_create_decoder(context, templ); > > + if (screen->device->chipset >= 0x110) > + return NULL;Is that really necessary? It'll already fail because it tries to create kepler's classes.> + > if (templ->entrypoint != PIPE_VIDEO_ENTRYPOINT_BITSTREAM) { > debug_printf("%x\n", templ->entrypoint); > return NULL; > -- > 1.8.5.5 > > _______________________________________________ > mesa-dev mailing list > mesa-dev at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Ilia Mirkin
2014-May-19 01:09 UTC
[Nouveau] [Mesa-dev] [PATCH] nvc0: maxwell has a new video engine, don't return a decoder object
On Sun, May 18, 2014 at 9:06 PM, Ben Skeggs <skeggsb at gmail.com> wrote:> On Mon, May 19, 2014 at 12:16 AM, Ilia Mirkin <imirkin at alum.mit.edu> wrote: >> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> >> --- >> src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c >> index 5871f59..c9ab13a 100644 >> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c >> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c >> @@ -77,6 +77,9 @@ nvc0_create_decoder(struct pipe_context *context, >> if (getenv("XVMC_VL")) >> return vl_create_decoder(context, templ); >> >> + if (screen->device->chipset >= 0x110) >> + return NULL; > Is that really necessary? It'll already fail because it tries to > create kepler's classes.Good point. I guess not then -- the regular teardown should handle any issues. I'll drop that patch.> >> + >> if (templ->entrypoint != PIPE_VIDEO_ENTRYPOINT_BITSTREAM) { >> debug_printf("%x\n", templ->entrypoint); >> return NULL; >> -- >> 1.8.5.5 >> >> _______________________________________________ >> mesa-dev mailing list >> mesa-dev at lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Reasonably Related Threads
- [PATCH] nvc0: maxwell has a new video engine, don't return a decoder object
- [PATCH] nv50: H.264/MPEG2 decoding support via VP2, available on NV84-NV96, NVA0
- [PATCH] nv50: H.264/MPEG2 decoding support via VP2, available on NV84-NV96, NVA0
- [PATCH] nv50: H.264/MPEG2 decoding support via VP2, available on NV84-NV96, NVA0
- [PATCH v2] nv50: H.264/MPEG2 decoding support via VP2, available on NV84-NV96, NVA0