summaryrefslogtreecommitdiff
authorIlia Mirkin <imirkin@alum.mit.edu>2013-07-29 23:28:45 (GMT)
committer Maarten Lankhorst <maarten.lankhorst@canonical.com>2013-08-15 13:15:23 (GMT)
commit940f7cec77316687e2b92c13a2446c88df0ece45 (patch) (side-by-side diff)
tree96e3f7ba6c8e20374461c3476f9f6545cd1dc244
parentee3ca3614ee55ed42bd8f78c62b7eaabb2a0fbe2 (diff)
downloadmesa-940f7cec77316687e2b92c13a2446c88df0ece45.zip
mesa-940f7cec77316687e2b92c13a2446c88df0ece45.tar.gz
nv50: allow forcing PMPEG use, for ease of testing
This also allows people who don't want to install the binary blobs required for VP2 to still get MPEG decoding. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/gallium/drivers/nv50/nv50_context.c3
-rw-r--r--src/gallium/drivers/nv50/nv50_screen.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index 79a0473..185d241 100644
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -258,7 +258,8 @@ nv50_create(struct pipe_screen *pscreen, void *priv)
draw_set_rasterize_stage(nv50->draw, nv50_draw_render_stage(nv50));
#endif
- if (screen->base.device->chipset < 0x84) {
+ if (screen->base.device->chipset < 0x84 ||
+ debug_get_bool_option("NOUVEAU_PMPEG", FALSE)) {
/* PMPEG */
nouveau_context_init_vdec(&nv50->base);
} else if (screen->base.device->chipset < 0x98 ||
diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c
index 2951eb4..0cbee5d 100644
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -647,7 +647,8 @@ nv50_screen_create(struct nouveau_device *dev)
nv50_screen_init_resource_functions(pscreen);
- if (screen->base.device->chipset < 0x84) {
+ if (screen->base.device->chipset < 0x84 ||
+ debug_get_bool_option("NOUVEAU_PMPEG", FALSE)) {
/* PMPEG */
nouveau_screen_init_vdec(&screen->base);
} else if (screen->base.device->chipset < 0x98 ||