From ee3ca3614ee55ed42bd8f78c62b7eaabb2a0fbe2 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Tue, 2 Jul 2013 17:33:41 -0400 Subject: [PATCH] nv30: hook up PMPEG support via nouveau_video, enables XvMC to work Force the format to be the reasonable format that doesn't require an inverse z-scan. Signed-off-by: Ilia Mirkin --- src/gallium/drivers/nouveau/nouveau_video.c | 27 +++++++++------------ src/gallium/drivers/nv30/nv30_context.c | 2 ++ src/gallium/drivers/nv30/nv30_screen.c | 1 + 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c index 5377872077c..0fdc3cefa1d 100644 --- a/src/gallium/drivers/nouveau/nouveau_video.c +++ b/src/gallium/drivers/nouveau/nouveau_video.c @@ -108,21 +108,10 @@ nouveau_vpe_mb_dct_blocks(struct nouveau_decoder *dec, const struct pipe_mpeg12_ short *db = mb->blocks; for (cbb = 0x20; cbb > 0; cbb >>= 1) { if (cbb & cbp) { - static const int lookup[64] = { - 0, 1, 8,16, 9, 2, 3,10, - 17,24,32,25,18,11, 4, 5, - 12,19,26,33,40,48,41,34, - 27,20,13, 6, 7,14,21,28, - 35,42,49,56,57,50,43,36, - 29,22,15,23,30,37,44,51, - 58,59,52,45,38,31,39,46, - 53,60,61,54,47,55,62,63 - }; - int i, j = 0, found = 0; + int i, found = 0; for (i = 0; i < 64; ++i) { - if (!db[lookup[i]]) { j += 2; continue; } - dec->data[dec->data_pos++] = (db[lookup[i]] << 16) | j; - j = 0; + if (!db[i]) continue; + dec->data[dec->data_pos++] = (db[i] << 16) | (i * 2); found = 1; } if (found) @@ -443,6 +432,11 @@ nouveau_decoder_decode_macroblock(struct pipe_video_decoder *decoder, dec->past = nouveau_decoder_surface_index(dec, desc->ref[0]); if (nouveau_vpe_init(dec)) return; + + /* initialize scan order */ + nouveau_vpe_write(dec, 0x720000c0); + nouveau_vpe_write(dec, dec->data_pos); + mb = (const struct pipe_mpeg12_macroblock *)pipe_mb; for (i = 0; i < num_macroblocks; ++i, mb++) { if (mb->macroblock_type & PIPE_MPEG12_MB_TYPE_INTRA) { @@ -528,6 +522,8 @@ 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) + goto vl; dec = CALLOC_STRUCT(nouveau_decoder); if (!dec) @@ -793,7 +789,8 @@ nouveau_video_buffer_create(struct pipe_context *pipe, * and it only supports the NV12 format */ if (templat->buffer_format != PIPE_FORMAT_NV12 || getenv("XVMC_VL") || - (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0)) + (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0) || + screen->device->chipset < 0x31 || screen->device->chipset == 0x35) return vl_video_buffer_create(pipe, templat); assert(templat->chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420); diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c index bd05042ca22..e872c027ae3 100644 --- a/src/gallium/drivers/nv30/nv30_context.c +++ b/src/gallium/drivers/nv30/nv30_context.c @@ -257,5 +257,7 @@ nv30_context_create(struct pipe_screen *pscreen, void *priv) return NULL; } + nouveau_context_init_vdec(&nv30->base); + return pipe; } diff --git a/src/gallium/drivers/nv30/nv30_screen.c b/src/gallium/drivers/nv30/nv30_screen.c index 3d55d6fd649..40e8b5fbbfc 100644 --- a/src/gallium/drivers/nv30/nv30_screen.c +++ b/src/gallium/drivers/nv30/nv30_screen.c @@ -377,6 +377,7 @@ nv30_screen_create(struct nouveau_device *dev) pscreen->context_create = nv30_context_create; pscreen->is_format_supported = nv30_screen_is_format_supported; nv30_resource_screen_init(pscreen); + nouveau_screen_init_vdec(&screen->base); screen->base.fence.emit = nv30_screen_fence_emit; screen->base.fence.update = nv30_screen_fence_update; -- 2.30.2