summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <m.b.lankhorst@gmail.com>2011-09-10 07:55:55 (GMT)
committerYounes Manton <younes.m@gmail.com>2011-09-10 18:22:11 (GMT)
commit1465dc26a540e2b6f8a055cf0ab48f774a3775bf (patch)
tree47b2cb4bc282b14c657a5df44924970816a21ae4
parent10dbd029279dda1689410d8ef2bc5aba64dd5958 (diff)
nouveau: Add support for XvMC acceleration
Try to use the PMPEG where available Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
-rw-r--r--src/gallium/drivers/nouveau/nouveau_video.c892
-rw-r--r--src/gallium/drivers/nouveau/nouveau_video.h42
-rw-r--r--src/gallium/drivers/nouveau/nv17_mpeg.xml.h265
-rw-r--r--src/gallium/drivers/nouveau/nv31_mpeg.xml.h130
-rw-r--r--src/gallium/drivers/nvfx/nvfx_context.c4
-rw-r--r--src/gallium/drivers/nvfx/nvfx_context.h2
6 files changed, 1328 insertions, 7 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c
index 620c030..75124e5 100644
--- a/src/gallium/drivers/nouveau/nouveau_video.c
+++ b/src/gallium/drivers/nouveau/nouveau_video.c
@@ -1,9 +1,842 @@
+/*
+ * Copyright 2011 Maarten Lankhorst
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
#include "vl/vl_decoder.h"
#include "vl/vl_video_buffer.h"
-#include "nouveau/nouveau_screen.h"
-#include "nouveau/nouveau_context.h"
+#include "nouveau_screen.h"
+#include "nouveau_context.h"
+#include "nouveau_video.h"
+
+#include "nvfx/nvfx_context.h"
+#include "nvfx/nvfx_resource.h"
+#include "nouveau/nouveau_bo.h"
+#include "nouveau/nouveau_buffer.h"
+#include "util/u_video.h"
+#include "util/u_format.h"
+#include "util/u_sampler.h"
+#include "nouveau/nouveau_device.h"
+#include "nouveau_winsys.h"
+
+static bool
+nouveau_video_is_nvfx(struct nouveau_decoder *dec) {
+ if (dec->screen->device->chipset < 0x50)
+ return true;
+ if (dec->screen->device->chipset >= 0x60 && dec->screen->device->chipset < 0x70)
+ return true;
+ return false;
+}
+
+static int
+nouveau_vpe_init(struct nouveau_decoder *dec) {
+ int ret;
+ if (dec->cmds)
+ return 0;
+ ret = nouveau_bo_map(dec->cmd_bo, NOUVEAU_BO_RDWR);
+ if (ret) {
+ debug_printf("Mapping cmd bo: %s\n", strerror(-ret));
+ return ret;
+ }
+ ret = nouveau_bo_map(dec->data_bo, NOUVEAU_BO_RDWR);
+ if (ret) {
+ nouveau_bo_unmap(dec->cmd_bo);
+ debug_printf("Mapping data bo: %s\n", strerror(-ret));
+ return ret;
+ }
+ dec->cmds = dec->cmd_bo->map;
+ dec->data = dec->data_bo->map;
+ return ret;
+}
+
+static void
+nouveau_vpe_synch(struct nouveau_decoder *dec) {
+ struct nouveau_channel *chan = dec->screen->channel;
+#if 0
+ if (dec->fence_map) {
+ BEGIN_RING(chan, dec->mpeg, NV84_MPEG_QUERY_COUNTER, 1);
+ OUT_RING(chan, ++dec->fence_seq);
+ FIRE_RING(chan);
+ while (dec->fence_map[0] != dec->fence_seq)
+ usleep(1000);
+ } else
+#endif
+ FIRE_RING(chan);
+}
+
+static void
+nouveau_vpe_fini(struct nouveau_decoder *dec) {
+ struct nouveau_channel *chan = dec->screen->channel;
+ if (!dec->cmds)
+ return;
+
+ nouveau_bo_unmap(dec->data_bo);
+ nouveau_bo_unmap(dec->cmd_bo);
+
+ MARK_RING(chan, 8, 2);
+ BEGIN_RING(chan, dec->mpeg, NV31_MPEG_CMD_OFFSET, 2);
+ OUT_RELOCl(chan, dec->cmd_bo, 0, NOUVEAU_BO_RD|NOUVEAU_BO_GART);
+ OUT_RING(chan, dec->ofs * 4);
+
+ BEGIN_RING(chan, dec->mpeg, NV31_MPEG_DATA_OFFSET, 2);
+ OUT_RELOCl(chan, dec->data_bo, 0, NOUVEAU_BO_RD|NOUVEAU_BO_GART);
+ OUT_RING(chan, dec->data_pos * 4);
+
+ BEGIN_RING(chan, dec->mpeg, NV31_MPEG_EXEC, 1);
+ OUT_RING(chan, 1);
+
+ nouveau_vpe_synch(dec);
+ dec->ofs = dec->data_pos = dec->num_surfaces = 0;
+ dec->cmds = dec->data = NULL;
+ dec->current = dec->future = dec->past = 8;
+}
+
+static INLINE void
+nouveau_vpe_mb_dct_blocks(struct nouveau_decoder *dec, const struct pipe_mpeg12_macroblock *mb)
+{
+ int cbb;
+ unsigned cbp = mb->coded_block_pattern;
+ 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;
+ 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;
+ found = 1;
+ }
+ if (found)
+ dec->data[dec->data_pos - 1] |= 1;
+ else
+ dec->data[dec->data_pos++] = 1;
+ db += 64;
+ } else if (mb->macroblock_type & PIPE_MPEG12_MB_TYPE_INTRA) {
+ dec->data[dec->data_pos++] = 1;
+ }
+ }
+}
+
+static INLINE void
+nouveau_vpe_mb_data_blocks(struct nouveau_decoder *dec, const struct pipe_mpeg12_macroblock *mb)
+{
+ int cbb;
+ unsigned cbp = mb->coded_block_pattern;
+ short *db = mb->blocks;
+ for (cbb = 0x20; cbb > 0; cbb >>= 1) {
+ if (cbb & cbp) {
+ memcpy(&dec->data[dec->data_pos], db, 128);
+ dec->data_pos += 32;
+ db += 64;
+ } else if (mb->macroblock_type & PIPE_MPEG12_MB_TYPE_INTRA) {
+ memset(&dec->data[dec->data_pos], 0, 128);
+ dec->data_pos += 32;
+ }
+ }
+}
+
+static INLINE void
+nouveau_vpe_mb_dct_header(struct nouveau_decoder *dec,
+ const struct pipe_mpeg12_macroblock *mb,
+ bool luma)
+{
+ unsigned base_dct, cbp;
+ bool intra = mb->macroblock_type & PIPE_MPEG12_MB_TYPE_INTRA;
+ unsigned x = mb->x * 16;
+ unsigned y = luma ? mb->y * 16 : mb->y * 8;
+
+ /* Setup the base dct header */
+ base_dct = dec->current << NV17_MPEG_CMD_CHROMA_MB_HEADER_SURFACE__SHIFT;
+ base_dct |= NV17_MPEG_CMD_CHROMA_MB_HEADER_RUN_SINGLE;
+
+ if (!(mb->x & 1))
+ base_dct |= NV17_MPEG_CMD_CHROMA_MB_HEADER_X_COORD_EVEN;
+ if (intra)
+ cbp = 0x3f;
+ else
+ cbp = mb->coded_block_pattern;
+
+ if (dec->picture_structure == PIPE_MPEG12_PICTURE_STRUCTURE_FRAME) {
+ base_dct |= NV17_MPEG_CMD_CHROMA_MB_HEADER_TYPE_FRAME;
+ if (luma && mb->macroblock_modes.bits.dct_type == PIPE_MPEG12_DCT_TYPE_FIELD)
+ base_dct |= NV17_MPEG_CMD_CHROMA_MB_HEADER_FRAME_DCT_TYPE_FIELD;
+ } else {
+ if (dec->picture_structure == PIPE_MPEG12_PICTURE_STRUCTURE_FIELD_BOTTOM)
+ base_dct |= NV17_MPEG_CMD_CHROMA_MB_HEADER_FIELD_BOTTOM;
+ if (!intra)
+ y *= 2;
+ }
+
+ if (luma) {
+ base_dct |= NV17_MPEG_CMD_LUMA_MB_HEADER_OP_LUMA_MB_HEADER;
+ base_dct |= (cbp >> 2) << NV17_MPEG_CMD_LUMA_MB_HEADER_CBP__SHIFT;
+ } else {
+ base_dct |= NV17_MPEG_CMD_CHROMA_MB_HEADER_OP_CHROMA_MB_HEADER;
+ base_dct |= (cbp & 3) << NV17_MPEG_CMD_CHROMA_MB_HEADER_CBP__SHIFT;
+ }
+ nouveau_vpe_write(dec, base_dct);
+ nouveau_vpe_write(dec, NV17_MPEG_CMD_MB_COORDS_OP_MB_COORDS |
+ x | (y << NV17_MPEG_CMD_MB_COORDS_Y__SHIFT));
+}
+
+static INLINE unsigned int
+nouveau_vpe_mb_mv_flags(bool luma, int mv_h, int mv_v, bool forward, bool first, bool vert)
+{
+ unsigned mc_header = 0;
+ if (luma)
+ mc_header |= NV17_MPEG_CMD_LUMA_MV_HEADER_OP_LUMA_MV_HEADER;
+ else
+ mc_header |= NV17_MPEG_CMD_CHROMA_MV_HEADER_OP_CHROMA_MV_HEADER;
+ if (mv_h & 1)
+ mc_header |= NV17_MPEG_CMD_CHROMA_MV_HEADER_X_HALF;
+ if (mv_v & 1)
+ mc_header |= NV17_MPEG_CMD_CHROMA_MV_HEADER_Y_HALF;
+ if (!forward)
+ mc_header |= NV17_MPEG_CMD_CHROMA_MV_HEADER_DIRECTION_BACKWARD;
+ if (!first)
+ mc_header |= NV17_MPEG_CMD_CHROMA_MV_HEADER_IDX;
+ if (vert)
+ mc_header |= NV17_MPEG_CMD_LUMA_MV_HEADER_FIELD_BOTTOM;
+ return mc_header;
+}
+
+static unsigned pos(int pos, int mov, int max) {
+ int ret = pos + mov;
+ if (pos < 0)
+ return 0;
+ if (pos >= max)
+ return max-1;
+ return ret;
+}
+
+/* because we want -1 / 2 = -1 */
+static int div_down(int val, int mult) {
+ val &= ~(mult - 1);
+ return val / mult;
+}
+
+static int div_up(int val, int mult) {
+ val += mult - 1;
+ return val / mult;
+}
+
+static INLINE void
+nouveau_vpe_mb_mv(struct nouveau_decoder *dec, unsigned mc_header,
+ bool luma, bool frame, bool forward, bool vert,
+ int x, int y, const short motions[2],
+ unsigned surface, bool first)
+{
+ unsigned mc_vector;
+ int mv_horizontal = motions[0];
+ int mv_vertical = motions[1];
+ int mv2 = mc_header & NV17_MPEG_CMD_CHROMA_MV_HEADER_COUNT_2;
+ unsigned width = dec->base.width;
+ unsigned height = dec->base.height;
+ if (mv2)
+ mv_vertical = div_down(mv_vertical, 2);
+ assert(frame); // Untested for non-frames
+ if (!frame)
+ height *= 2;
+
+ mc_header |= surface << NV17_MPEG_CMD_CHROMA_MV_HEADER_SURFACE__SHIFT;
+ if (!luma) {
+ mv_vertical = div_up(mv_vertical, 2);
+ mv_horizontal = div_up(mv_horizontal, 2);
+ height /= 2;
+ }
+ mc_header |= nouveau_vpe_mb_mv_flags(luma, mv_horizontal, mv_vertical, forward, first, vert);
+ nouveau_vpe_write(dec, mc_header);
+
+ mc_vector = NV17_MPEG_CMD_MV_COORDS_OP_MV_COORDS;
+ if (luma)
+ mc_vector |= pos(x, div_down(mv_horizontal, 2), width);
+ else
+ mc_vector |= pos(x, mv_horizontal & ~1, width);
+ if (!mv2)
+ mc_vector |= pos(y, div_down(mv_vertical, 2), height) << NV17_MPEG_CMD_MV_COORDS_Y__SHIFT;
+ else
+ mc_vector |= pos(y, mv_vertical & ~1, height) << NV17_MPEG_CMD_MV_COORDS_Y__SHIFT;
+ nouveau_vpe_write(dec, mc_vector);
+}
+
+static void
+nouveau_vpe_mb_mv_header(struct nouveau_decoder *dec,
+ const struct pipe_mpeg12_macroblock *mb,
+ bool luma)
+{
+ bool frame = dec->picture_structure == PIPE_MPEG12_PICTURE_STRUCTURE_FRAME;
+ unsigned base;
+ bool forward, backward;
+ int y, y2, x = mb->x * 16;
+ if (luma)
+ y = mb->y * (frame ? 16 : 32);
+ else
+ y = mb->y * (frame ? 8 : 16);
+ if (frame)
+ y2 = y;
+ else
+ y2 = y + (luma ? 16 : 8);
+
+ forward = mb->macroblock_type & PIPE_MPEG12_MB_TYPE_MOTION_FORWARD;
+ backward = mb->macroblock_type & PIPE_MPEG12_MB_TYPE_MOTION_BACKWARD;
+ assert(!forward || dec->past < 8);
+ assert(!backward || dec->future < 8);
+ if (frame) {
+ switch (mb->macroblock_modes.bits.frame_motion_type) {
+ case PIPE_MPEG12_MO_TYPE_FRAME: goto mv1;
+ case PIPE_MPEG12_MO_TYPE_FIELD: goto mv2;
+ case PIPE_MPEG12_MO_TYPE_DUAL_PRIME: {
+ base = NV17_MPEG_CMD_CHROMA_MV_HEADER_COUNT_2;
+ if (forward) {
+ nouveau_vpe_mb_mv(dec, base, luma, frame, TRUE, FALSE,
+ x, y, mb->PMV[0][0], dec->past, TRUE);
+ nouveau_vpe_mb_mv(dec, base, luma, frame, TRUE, TRUE,
+ x, y2, mb->PMV[0][0], dec->past, FALSE);
+ }
+ if (backward && forward) {
+ nouveau_vpe_mb_mv(dec, base, luma, frame, !forward, TRUE,
+ x, y, mb->PMV[1][0], dec->future, TRUE);
+ nouveau_vpe_mb_mv(dec, base, luma, frame, !forward, FALSE,
+ x, y2, mb->PMV[1][1], dec->future, FALSE);
+ } else assert(!backward);
+ break;
+ }
+ default: assert(0);
+ }
+ } else {
+ switch (mb->macroblock_modes.bits.field_motion_type) {
+ case PIPE_MPEG12_MO_TYPE_FIELD: goto mv1;
+ case PIPE_MPEG12_MO_TYPE_16x8: goto mv2;
+ case PIPE_MPEG12_MO_TYPE_DUAL_PRIME: {
+ base = NV17_MPEG_CMD_CHROMA_MV_HEADER_MV_SPLIT_HALF_MB;
+ if (frame)
+ base |= NV17_MPEG_CMD_CHROMA_MV_HEADER_TYPE_FRAME;
+ if (forward)
+ nouveau_vpe_mb_mv(dec, base, luma, frame, TRUE,
+ dec->picture_structure != PIPE_MPEG12_PICTURE_STRUCTURE_FIELD_TOP,
+ x, y, mb->PMV[0][0], dec->past, TRUE);
+ if (backward && forward)
+ nouveau_vpe_mb_mv(dec, base, luma, frame, FALSE,
+ dec->picture_structure == PIPE_MPEG12_PICTURE_STRUCTURE_FIELD_TOP,
+ x, y, mb->PMV[0][1], dec->future, TRUE);
+ else assert(!backward);
+ break;
+ }
+ default: assert(0);
+ }
+ }
+ return;
+
+mv1:
+ base = NV17_MPEG_CMD_CHROMA_MV_HEADER_MV_SPLIT_HALF_MB;
+ if (frame)
+ base |= NV17_MPEG_CMD_CHROMA_MV_HEADER_TYPE_FRAME;
+ /* frame 16x16 */
+ if (forward)
+ nouveau_vpe_mb_mv(dec, base, luma, frame, TRUE, FALSE,
+ x, y, mb->PMV[0][0], dec->past, TRUE);
+ if (backward)
+ nouveau_vpe_mb_mv(dec, base, luma, frame, !forward, FALSE,
+ x, y, mb->PMV[0][1], dec->future, TRUE);
+ return;
+
+mv2:
+ base = NV17_MPEG_CMD_CHROMA_MV_HEADER_COUNT_2;
+ if (!frame)
+ base |= NV17_MPEG_CMD_CHROMA_MV_HEADER_MV_SPLIT_HALF_MB;
+ if (forward) {
+ nouveau_vpe_mb_mv(dec, base, luma, frame, TRUE,
+ mb->motion_vertical_field_select & PIPE_MPEG12_FS_FIRST_FORWARD,
+ x, y, mb->PMV[0][0], dec->past, TRUE);
+ nouveau_vpe_mb_mv(dec, base, luma, frame, TRUE,
+ mb->motion_vertical_field_select & PIPE_MPEG12_FS_SECOND_FORWARD,
+ x, y2, mb->PMV[1][0], dec->past, FALSE);
+ }
+ if (backward) {
+ nouveau_vpe_mb_mv(dec, base, luma, frame, !forward,
+ mb->motion_vertical_field_select & PIPE_MPEG12_FS_FIRST_BACKWARD,
+ x, y, mb->PMV[0][1], dec->future, TRUE);
+ nouveau_vpe_mb_mv(dec, base, luma, frame, !forward,
+ mb->motion_vertical_field_select & PIPE_MPEG12_FS_SECOND_BACKWARD,
+ x, y2, mb->PMV[1][1], dec->future, FALSE);
+ }
+}
+
+static unsigned
+nouveau_decoder_surface_index(struct nouveau_decoder *dec,
+ struct pipe_video_buffer *buffer)
+{
+ struct nouveau_video_buffer *buf = (struct nouveau_video_buffer *)buffer;
+ struct nouveau_channel *chan = dec->screen->channel;
+ struct nouveau_bo *bo_y, *bo_c;
+ unsigned i;
+
+ if (!buf)
+ return 8;
+ for (i = 0; i < dec->num_surfaces; ++i) {
+ if (dec->surfaces[i] == buf)
+ return i;
+ }
+ assert(i < 8);
+ dec->surfaces[i] = buf;
+ dec->num_surfaces++;
+
+ if (nouveau_video_is_nvfx(dec)) {
+ bo_y = ((struct nvfx_resource *)buf->resources[0])->bo;
+ bo_c = ((struct nvfx_resource *)buf->resources[1])->bo;
+ } else {
+ bo_y = ((struct nv04_resource *)buf->resources[0])->bo;
+ bo_c = ((struct nv04_resource *)buf->resources[1])->bo;
+ }
+ MARK_RING(chan, 3, 2);
+ BEGIN_RING(chan, dec->mpeg, NV31_MPEG_IMAGE_Y_OFFSET(i), 2);
+ OUT_RELOCl(chan, bo_y, 0, NOUVEAU_BO_RDWR);
+ OUT_RELOCl(chan, bo_c, 0, NOUVEAU_BO_RDWR);
+ return i;
+}
+
+static void
+nouveau_decoder_set_picture_parameters(struct pipe_video_decoder *decoder,
+ struct pipe_picture_desc *picture_desc)
+{
+ struct nouveau_decoder *dec = (struct nouveau_decoder *)decoder;
+ struct pipe_mpeg12_picture_desc *desc;
+ desc = (struct pipe_mpeg12_picture_desc *)picture_desc;
+ dec->picture_structure = desc->picture_structure;
+}
+
+static void
+nouveau_decoder_set_reference_frames(struct pipe_video_decoder *decoder,
+ struct pipe_video_buffer **buffers,
+ unsigned count)
+{
+ struct nouveau_decoder *dec = (struct nouveau_decoder *)decoder;
+ if (count >= 1 && buffers[0])
+ dec->past = nouveau_decoder_surface_index(dec, buffers[0]);
+ if (count >= 2 && buffers[1])
+ dec->future = nouveau_decoder_surface_index(dec, buffers[1]);
+}
+
+static void
+nouveau_decoder_set_decode_target(struct pipe_video_decoder *decoder,
+ struct pipe_video_buffer *buffer)
+{
+ struct nouveau_decoder *dec = (struct nouveau_decoder *)decoder;
+ dec->current = nouveau_decoder_surface_index(dec, buffer);
+}
+
+static void
+nouveau_decoder_decode_macroblock(struct pipe_video_decoder *decoder,
+ const struct pipe_macroblock *pipe_mb,
+ unsigned num_macroblocks)
+{
+ struct nouveau_decoder *dec = (struct nouveau_decoder *)decoder;
+ const struct pipe_mpeg12_macroblock *mb;
+ unsigned i;
+ assert(dec->current < 8);
+
+ if (nouveau_vpe_init(dec)) return;
+ 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) {
+ nouveau_vpe_mb_dct_header(dec, mb, TRUE);
+ nouveau_vpe_mb_dct_header(dec, mb, FALSE);
+ } else {
+ nouveau_vpe_mb_mv_header(dec, mb, TRUE);
+ nouveau_vpe_mb_dct_header(dec, mb, TRUE);
+
+ nouveau_vpe_mb_mv_header(dec, mb, FALSE);
+ nouveau_vpe_mb_dct_header(dec, mb, FALSE);
+ }
+ if (dec->base.entrypoint <= PIPE_VIDEO_ENTRYPOINT_IDCT)
+ nouveau_vpe_mb_dct_blocks(dec, mb);
+ else
+ nouveau_vpe_mb_data_blocks(dec, mb);
+ }
+}
+
+static void
+nouveau_decoder_flush(struct pipe_video_decoder *decoder)
+{
+ struct nouveau_decoder *dec = (struct nouveau_decoder *)decoder;
+ if (dec->ofs)
+ nouveau_vpe_fini(dec);
+}
+
+static void
+nouveau_decoder_destroy(struct pipe_video_decoder *decoder)
+{
+ struct nouveau_decoder *dec = (struct nouveau_decoder*)decoder;
+
+ if (dec->cmds) {
+ nouveau_bo_unmap(dec->data_bo);
+ nouveau_bo_unmap(dec->cmd_bo);
+ }
+
+ if (dec->data_bo)
+ nouveau_bo_ref(NULL, &dec->data_bo);
+ if (dec->cmd_bo)
+ nouveau_bo_ref(NULL, &dec->cmd_bo);
+ if (dec->fence_bo)
+ nouveau_bo_ref(NULL, &dec->fence_bo);
+ nouveau_grobj_free(&dec->mpeg);
+ FREE(dec);
+}
+
+static void
+nouveau_decoder_begin_frame(struct pipe_video_decoder *decoder)
+{
+}
+
+static void
+nouveau_decoder_end_frame(struct pipe_video_decoder *decoder)
+{
+}
+
+static struct pipe_video_decoder *
+nouveau_create_decoder(struct pipe_context *context,
+ struct nouveau_screen *screen,
+ enum pipe_video_profile profile,
+ enum pipe_video_entrypoint entrypoint,
+ enum pipe_video_chroma_format chroma_format,
+ unsigned width, unsigned height)
+{
+ struct nouveau_channel *chan = screen->channel;
+ struct nouveau_grobj *mpeg = NULL;
+ struct nouveau_decoder *dec;
+ int ret;
+ bool is8274 = screen->device->chipset > 0x80;
+
+ debug_printf("Acceleration level: %s\n", entrypoint <= PIPE_VIDEO_ENTRYPOINT_BITSTREAM ? "bit":
+ entrypoint == PIPE_VIDEO_ENTRYPOINT_IDCT ? "IDCT" : "MC");
+
+ if (getenv("XVMC_VL"))
+ goto vl;
+ if (u_reduce_video_profile(profile) != PIPE_VIDEO_CODEC_MPEG12)
+ goto vl;
+ if (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0)
+ goto vl;
+
+ width = align(width, 64);
+ height = align(height, 64);
+
+ if (is8274)
+ ret = nouveau_grobj_alloc(chan, 0xbeef8274, 0x8274, &mpeg);
+ else
+ ret = nouveau_grobj_alloc(chan, 0xbeef8274, 0x3174, &mpeg);
+ if (ret < 0) {
+ debug_printf("Creation failed: %s (%i)\n", strerror(-ret), ret);
+ return NULL;
+ }
+
+ dec = CALLOC_STRUCT(nouveau_decoder);
+ if (!dec) {
+ nouveau_grobj_free(&mpeg);
+ goto fail;
+ }
+ dec->mpeg = mpeg;
+ dec->base.context = context;
+ dec->base.profile = profile;
+ dec->base.entrypoint = entrypoint;
+ dec->base.chroma_format = chroma_format;
+ dec->base.width = width;
+ dec->base.height = height;
+ dec->base.destroy = nouveau_decoder_destroy;
+ dec->base.begin_frame = nouveau_decoder_begin_frame;
+ dec->base.end_frame = nouveau_decoder_end_frame;
+ dec->base.set_decode_target = nouveau_decoder_set_decode_target;
+ dec->base.set_picture_parameters = nouveau_decoder_set_picture_parameters;
+ dec->base.set_reference_frames = nouveau_decoder_set_reference_frames;
+ dec->base.decode_macroblock = nouveau_decoder_decode_macroblock;
+ dec->base.flush = nouveau_decoder_flush;
+ dec->screen = screen;
+
+ ret = nouveau_bo_new(dec->screen->device, NOUVEAU_BO_GART, 0, 1024 * 1024, &dec->cmd_bo);
+ if (ret)
+ goto fail;
+
+ ret = nouveau_bo_new(dec->screen->device, NOUVEAU_BO_GART, 0, width * height * 6, &dec->data_bo);
+ if (ret)
+ goto fail;
+
+ ret = nouveau_bo_new(dec->screen->device, NOUVEAU_BO_GART|NOUVEAU_BO_MAP, 0, 4096,
+ &dec->fence_bo);
+ if (ret)
+ goto fail;
+ nouveau_bo_map(dec->fence_bo, NOUVEAU_BO_RDWR);
+ dec->fence_map = dec->fence_bo->map;
+ nouveau_bo_unmap(dec->fence_bo);
+ dec->fence_map[0] = 0;
+
+ if (is8274)
+ MARK_RING(chan, 25, 3);
+ else
+ MARK_RING(chan, 20, 2);
+
+ BEGIN_RING(chan, mpeg, NV31_MPEG_DMA_CMD, 1);
+ OUT_RING(chan, chan->vram->handle);
+
+ BEGIN_RING(chan, mpeg, NV31_MPEG_DMA_DATA, 1);
+ OUT_RING(chan, chan->vram->handle);
+
+ BEGIN_RING(chan, mpeg, NV31_MPEG_DMA_IMAGE, 1);
+ OUT_RING(chan, chan->vram->handle);
+
+ BEGIN_RING(chan, mpeg, NV31_MPEG_PITCH, 2);
+ OUT_RING(chan, width | NV31_MPEG_PITCH_UNK);
+ OUT_RING(chan, (height << NV31_MPEG_SIZE_H__SHIFT) | width);
+
+ BEGIN_RING(chan, mpeg, NV31_MPEG_FORMAT, 2);
+ OUT_RING(chan, 0);
+ switch (entrypoint) {
+ case PIPE_VIDEO_ENTRYPOINT_BITSTREAM: OUT_RING(chan, 0x100); break;
+ case PIPE_VIDEO_ENTRYPOINT_IDCT: OUT_RING(chan, 1); break;
+ case PIPE_VIDEO_ENTRYPOINT_MC: OUT_RING(chan, 0); break;
+ default: assert(0);
+ }
+
+ if (is8274) {
+ BEGIN_RING(chan, mpeg, NV84_MPEG_DMA_QUERY, 1);
+ OUT_RING(chan, chan->vram->handle);
+
+ BEGIN_RING(chan, mpeg, NV84_MPEG_QUERY_OFFSET, 2);
+ OUT_RELOCl(chan, dec->fence_bo, 0, NOUVEAU_BO_WR|NOUVEAU_BO_GART);
+ OUT_RING(chan, dec->fence_seq);
+ }
+
+ ret = nouveau_vpe_init(dec);
+ if (ret)
+ goto fail;
+ nouveau_vpe_fini(dec);
+ return &dec->base;
+
+fail:
+ nouveau_decoder_destroy(&dec->base);
+ return NULL;
+
+vl:
+ debug_printf("Using g3dvl renderer\n");
+ return vl_create_decoder(context, profile, entrypoint,
+ chroma_format, width, height);
+}
+
+static struct pipe_sampler_view **
+nouveau_video_buffer_sampler_view_planes(struct pipe_video_buffer *buffer)
+{
+ struct nouveau_video_buffer *buf = (struct nouveau_video_buffer *)buffer;
+ struct pipe_sampler_view sv_templ;
+ struct pipe_context *pipe;
+ unsigned i;
+
+ assert(buf);
+
+ pipe = buf->base.context;
+
+ for (i = 0; i < buf->num_planes; ++i ) {
+ if (!buf->sampler_view_planes[i]) {
+ memset(&sv_templ, 0, sizeof(sv_templ));
+ u_sampler_view_default_template(&sv_templ, buf->resources[i], buf->resources[i]->format);
+
+ if (util_format_get_nr_components(buf->resources[i]->format) == 1)
+ sv_templ.swizzle_r = sv_templ.swizzle_g = sv_templ.swizzle_b = sv_templ.swizzle_a = PIPE_SWIZZLE_RED;
+
+ buf->sampler_view_planes[i] = pipe->create_sampler_view(pipe, buf->resources[i], &sv_templ);
+ if (!buf->sampler_view_planes[i])
+ goto error;
+ }
+ }
+
+ return buf->sampler_view_planes;
+
+error:
+ for (i = 0; i < buf->num_planes; ++i )
+ pipe_sampler_view_reference(&buf->sampler_view_planes[i], NULL);
+
+ return NULL;
+}
+
+static struct pipe_sampler_view **
+nouveau_video_buffer_sampler_view_components(struct pipe_video_buffer *buffer)
+{
+ struct nouveau_video_buffer *buf = (struct nouveau_video_buffer *)buffer;
+ struct pipe_sampler_view sv_templ;
+ struct pipe_context *pipe;
+ unsigned i, j, component;
+
+ assert(buf);
+
+ pipe = buf->base.context;
+
+ for (component = 0, i = 0; i < buf->num_planes; ++i ) {
+ unsigned nr_components = util_format_get_nr_components(buf->resources[i]->format);
+
+ for (j = 0; j < nr_components; ++j, ++component) {
+ assert(component < VL_MAX_PLANES);
+
+ if (!buf->sampler_view_components[component]) {
+ memset(&sv_templ, 0, sizeof(sv_templ));
+ u_sampler_view_default_template(&sv_templ, buf->resources[i], buf->resources[i]->format);
+ sv_templ.swizzle_r = sv_templ.swizzle_g = sv_templ.swizzle_b = PIPE_SWIZZLE_RED + j;
+ sv_templ.swizzle_a = PIPE_SWIZZLE_ONE;
+ buf->sampler_view_components[component] = pipe->create_sampler_view(pipe, buf->resources[i], &sv_templ);
+ if (!buf->sampler_view_components[component])
+ goto error;
+ }
+ }
+ }
+
+ return buf->sampler_view_components;
+
+error:
+ for (i = 0; i < 3; ++i )
+ pipe_sampler_view_reference(&buf->sampler_view_components[i], NULL);
+
+ return NULL;
+}
+
+static struct pipe_surface **
+nouveau_video_buffer_surfaces(struct pipe_video_buffer *buffer)
+{
+ struct nouveau_video_buffer *buf = (struct nouveau_video_buffer *)buffer;
+ struct pipe_surface surf_templ;
+ struct pipe_context *pipe;
+ unsigned i;
+
+ assert(buf);
+
+ pipe = buf->base.context;
+
+ for (i = 0; i < buf->num_planes; ++i ) {
+ if (!buf->surfaces[i]) {
+ memset(&surf_templ, 0, sizeof(surf_templ));
+ surf_templ.format = buf->resources[i]->format;
+ surf_templ.usage = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
+ buf->surfaces[i] = pipe->create_surface(pipe, buf->resources[i], &surf_templ);
+ if (!buf->surfaces[i])
+ goto error;
+ }
+ }
+
+ return buf->surfaces;
+
+error:
+ for (i = 0; i < buf->num_planes; ++i )
+ pipe_surface_reference(&buf->surfaces[i], NULL);
+
+ return NULL;
+}
+
+static void
+nouveau_video_buffer_destroy(struct pipe_video_buffer *buffer)
+{
+ struct nouveau_video_buffer *buf = (struct nouveau_video_buffer *)buffer;
+ unsigned i;
+
+ assert(buf);
+
+ for (i = 0; i < buf->num_planes; ++i) {
+ pipe_surface_reference(&buf->surfaces[i], NULL);
+ pipe_sampler_view_reference(&buf->sampler_view_planes[i], NULL);
+ pipe_sampler_view_reference(&buf->sampler_view_components[i], NULL);
+ pipe_resource_reference(&buf->resources[i], NULL);
+ }
+ for (;i < 3;++i)
+ pipe_sampler_view_reference(&buf->sampler_view_components[i], NULL);
+
+ FREE(buffer);
+}
+
+static struct pipe_video_buffer *
+nouveau_video_buffer_create(struct pipe_context *pipe,
+ struct nouveau_screen *screen,
+ enum pipe_format buffer_format,
+ enum pipe_video_chroma_format chroma_format,
+ unsigned width, unsigned height)
+{
+ struct nouveau_video_buffer *buffer;
+ struct pipe_resource templ;
+
+ /* Only do a linear surface when a hardware decoder is used
+ * hardware decoder is only supported on some chipsets
+ * and it only supports the NV12 format
+ */
+ if (buffer_format != PIPE_FORMAT_NV12 || getenv("XVMC_VL") ||
+ (screen->device->chipset >= 0x98 && screen->device->chipset != 0xa0))
+ return vl_video_buffer_create(pipe, buffer_format, chroma_format, width, height);
+
+ assert(chroma_format == PIPE_VIDEO_CHROMA_FORMAT_420);
+ width = align(width, 64);
+ height = align(height, 64);
+
+ buffer = CALLOC_STRUCT(nouveau_video_buffer);
+ if (!buffer)
+ return NULL;
+
+ buffer->base.context = pipe;
+ buffer->base.destroy = nouveau_video_buffer_destroy;
+ buffer->base.get_sampler_view_planes = nouveau_video_buffer_sampler_view_planes;
+ buffer->base.get_sampler_view_components = nouveau_video_buffer_sampler_view_components;
+ buffer->base.get_surfaces = nouveau_video_buffer_surfaces;
+ buffer->base.chroma_format = chroma_format;
+ buffer->base.width = width;
+ buffer->base.height = height;
+ buffer->num_planes = 2;
+
+ memset(&templ, 0, sizeof(templ));
+ templ.target = PIPE_TEXTURE_2D;
+ templ.format = PIPE_FORMAT_R8_UNORM;
+ templ.width0 = width;
+ templ.height0 = height;
+ templ.depth0 = 1;
+ templ.array_size = 1;
+ templ.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
+ templ.usage = PIPE_USAGE_STATIC;
+ templ.flags = NOUVEAU_RESOURCE_FLAG_LINEAR;
+
+ buffer->resources[0] = pipe->screen->resource_create(pipe->screen, &templ);
+ if (!buffer->resources[0])
+ goto error;
+ templ.width0 /= 2;
+ templ.height0 /= 2;
+ templ.format = PIPE_FORMAT_R8G8_UNORM;
+ buffer->resources[1] = pipe->screen->resource_create(pipe->screen, &templ);
+ if (!buffer->resources[1])
+ goto error;
+ return &buffer->base;
+
+error:
+ nouveau_video_buffer_destroy(&buffer->base);
+ FREE(buffer);
+ return NULL;
+}
static int
nouveau_screen_get_video_param(struct pipe_screen *pscreen,
@@ -33,9 +866,60 @@ nouveau_screen_init_vdec(struct nouveau_screen *screen)
screen->base.is_video_format_supported = vl_video_buffer_is_format_supported;
}
+static struct pipe_video_decoder *
+nvfx_context_create_decoder(struct pipe_context *context,
+ enum pipe_video_profile profile,
+ enum pipe_video_entrypoint entrypoint,
+ enum pipe_video_chroma_format chroma_format,
+ unsigned width, unsigned height)
+{
+ struct nouveau_screen *screen = &nvfx_context(context)->screen->base;
+ return nouveau_create_decoder(context, screen, profile, entrypoint,
+ chroma_format, width, height);
+}
+
+static struct pipe_video_buffer *
+nvfx_context_video_buffer_create(struct pipe_context *pipe,
+ enum pipe_format buffer_format,
+ enum pipe_video_chroma_format chroma_format,
+ unsigned width, unsigned height)
+{
+ struct nouveau_screen *screen = &nvfx_context(pipe)->screen->base;
+ return nouveau_video_buffer_create(pipe, screen, buffer_format, chroma_format, width, height);
+}
+
+void
+nvfx_context_init_vdec(struct nvfx_context *nv)
+{
+ nv->pipe.create_video_decoder = nvfx_context_create_decoder;
+ nv->pipe.create_video_buffer = nvfx_context_video_buffer_create;
+}
+
+static struct pipe_video_decoder *
+nouveau_context_create_decoder(struct pipe_context *context,
+ enum pipe_video_profile profile,
+ enum pipe_video_entrypoint entrypoint,
+ enum pipe_video_chroma_format chroma_format,
+ unsigned width, unsigned height)
+{
+ struct nouveau_screen *screen = nouveau_context(context)->screen;
+ return nouveau_create_decoder(context, screen, profile, entrypoint,
+ chroma_format, width, height);
+}
+
+static struct pipe_video_buffer *
+nouveau_context_video_buffer_create(struct pipe_context *pipe,
+ enum pipe_format buffer_format,
+ enum pipe_video_chroma_format chroma_format,
+ unsigned width, unsigned height)
+{
+ struct nouveau_screen *screen = nouveau_context(pipe)->screen;
+ return nouveau_video_buffer_create(pipe, screen, buffer_format, chroma_format, width, height);
+}
+
void
nouveau_context_init_vdec(struct nouveau_context *nv)
{
- nv->pipe.create_video_decoder = vl_create_decoder;
- nv->pipe.create_video_buffer = vl_video_buffer_create;
+ nv->pipe.create_video_decoder = nouveau_context_create_decoder;
+ nv->pipe.create_video_buffer = nouveau_context_video_buffer_create;
}
diff --git a/src/gallium/drivers/nouveau/nouveau_video.h b/src/gallium/drivers/nouveau/nouveau_video.h
new file mode 100644
index 0000000..c6875c3
--- /dev/null
+++ b/src/gallium/drivers/nouveau/nouveau_video.h
@@ -0,0 +1,42 @@
+#ifndef __NOUVEAU_VIDEO_H__
+#define __NOUVEAU_SCREEN_H__
+
+#include "nv17_mpeg.xml.h"
+#include "nv31_mpeg.xml.h"
+
+struct nouveau_video_buffer {
+ struct pipe_video_buffer base;
+ unsigned num_planes;
+ struct pipe_resource *resources[2];
+ struct pipe_sampler_view *sampler_view_planes[2];
+ struct pipe_sampler_view *sampler_view_components[3];
+ struct pipe_surface *surfaces[2];
+};
+
+struct nouveau_decoder {
+ struct pipe_video_decoder base;
+ struct nouveau_screen *screen;
+ struct nouveau_grobj *mpeg;
+ struct nouveau_bo *cmd_bo, *data_bo, *fence_bo;
+
+ unsigned *fence_map;
+ unsigned fence_seq;
+
+ unsigned ofs;
+ unsigned *cmds;
+
+ unsigned *data;
+ unsigned data_pos;
+ unsigned picture_structure;
+
+ unsigned past, future, current;
+ unsigned num_surfaces;
+ struct nouveau_video_buffer *surfaces[8];
+};
+
+static INLINE void
+nouveau_vpe_write(struct nouveau_decoder *dec, unsigned data) {
+ dec->cmds[dec->ofs++] = data;
+}
+
+#endif
diff --git a/src/gallium/drivers/nouveau/nv17_mpeg.xml.h b/src/gallium/drivers/nouveau/nv17_mpeg.xml.h
new file mode 100644
index 0000000..a27310f
--- /dev/null
+++ b/src/gallium/drivers/nouveau/nv17_mpeg.xml.h
@@ -0,0 +1,265 @@
+#ifndef ___RNNDB_NV17_MPEG_XML
+#define ___RNNDB_NV17_MPEG_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- ../rnndb/nv17_mpeg.xml ( 6846 bytes, from 2011-08-08 14:21:26)
+- ../rnndb/copyright.xml ( 6452 bytes, from 2011-07-15 12:42:43)
+- ../rnndb/nvchipsets.xml ( 3617 bytes, from 2011-07-22 11:37:48)
+
+Copyright (C) 2006-2011 by the following authors:
+- Artur Huillet <arthur.huillet@free.fr> (ahuillet)
+- Ben Skeggs (darktama, darktama_)
+- B. R. <koala_br@users.sourceforge.net> (koala_br)
+- Carlos Martin <carlosmn@users.sf.net> (carlosmn)
+- Christoph Bumiller <e0425955@student.tuwien.ac.at> (calim, chrisbmr)
+- Dawid Gajownik <gajownik@users.sf.net> (gajownik)
+- Dmitry Baryshkov
+- Dmitry Eremin-Solenikov <lumag@users.sf.net> (lumag)
+- EdB <edb_@users.sf.net> (edb_)
+- Erik Waling <erikwailing@users.sf.net> (erikwaling)
+- Francisco Jerez <currojerez@riseup.net> (curro)
+- imirkin <imirkin@users.sf.net> (imirkin)
+- jb17bsome <jb17bsome@bellsouth.net> (jb17bsome)
+- Jeremy Kolb <kjeremy@users.sf.net> (kjeremy)
+- Laurent Carlier <lordheavym@gmail.com> (lordheavy)
+- Luca Barbieri <luca@luca-barbieri.com> (lb, lb1)
+- Maarten Maathuis <madman2003@gmail.com> (stillunknown)
+- Marcin Koƛcielnicki <koriakin@0x04.net> (mwk, koriakin)
+- Mark Carey <mark.carey@gmail.com> (careym)
+- Matthieu Castet <matthieu.castet@parrot.com> (mat-c)
+- nvidiaman <nvidiaman@users.sf.net> (nvidiaman)
+- Patrice Mandin <patmandin@gmail.com> (pmandin, pmdata)
+- Pekka Paalanen <pq@iki.fi> (pq, ppaalanen)
+- Peter Popov <ironpeter@users.sf.net> (ironpeter)
+- Richard Hughes <hughsient@users.sf.net> (hughsient)
+- Rudi Cilibrasi <cilibrar@users.sf.net> (cilibrar)
+- Serge Martin
+- Simon Raffeiner
+- Stephane Loeuillet <leroutier@users.sf.net> (leroutier)
+- Stephane Marchesin <stephane.marchesin@gmail.com> (marcheu)
+- sturmflut <sturmflut@users.sf.net> (sturmflut)
+- Sylvain Munaut <tnt@246tNt.com>
+- Victor Stinner <victor.stinner@haypocalc.com> (haypo)
+- Wladmir van der Laan <laanwj@gmail.com> (miathan6)
+- Younes Manton <younes.m@gmail.com> (ymanton)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+#define NV17_MPEG_CMD_NOP_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_NOP_OP__SHIFT 28
+#define NV17_MPEG_CMD_NOP_OP_NOP 0x10000000
+#define NV17_MPEG_CMD_SURFACE_OFFSET__MASK 0x00ffffff
+#define NV17_MPEG_CMD_SURFACE_OFFSET__SHIFT 0
+#define NV17_MPEG_CMD_SURFACE_OFFSET__SHR 5
+#define NV17_MPEG_CMD_SURFACE_PLANE__MASK 0x01000000
+#define NV17_MPEG_CMD_SURFACE_PLANE__SHIFT 24
+#define NV17_MPEG_CMD_SURFACE_PLANE_LUMA 0x00000000
+#define NV17_MPEG_CMD_SURFACE_PLANE_CHROMA 0x01000000
+#define NV17_MPEG_CMD_SURFACE_INDEX__MASK 0x0e000000
+#define NV17_MPEG_CMD_SURFACE_INDEX__SHIFT 25
+#define NV17_MPEG_CMD_SURFACE_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_SURFACE_OP__SHIFT 28
+#define NV17_MPEG_CMD_SURFACE_OP_SURFACE 0x20000000
+#define NV17_MPEG_CMD_SIZE_WIDTH__MASK 0x000007ff
+#define NV17_MPEG_CMD_SIZE_WIDTH__SHIFT 0
+#define NV17_MPEG_CMD_SIZE_HEIGHT__MASK 0x007ff000
+#define NV17_MPEG_CMD_SIZE_HEIGHT__SHIFT 12
+#define NV17_MPEG_CMD_SIZE_OP__MASK 0xff000000
+#define NV17_MPEG_CMD_SIZE_OP__SHIFT 24
+#define NV17_MPEG_CMD_SIZE_OP_SIZE 0x30000000
+#define NV17_MPEG_CMD_PITCH_PITCH__MASK 0x0000007f
+#define NV17_MPEG_CMD_PITCH_PITCH__SHIFT 0
+#define NV17_MPEG_CMD_PITCH_OP__MASK 0xff000000
+#define NV17_MPEG_CMD_PITCH_OP__SHIFT 24
+#define NV17_MPEG_CMD_PITCH_OP_PITCH 0x31000000
+#define NV17_MPEG_CMD_MODE_IDCT_ENABLE 0x00000001
+#define NV17_MPEG_CMD_MODE_IQ_ENABLE 0x00000010
+#define NV17_MPEG_CMD_MODE_OP__MASK 0xff000000
+#define NV17_MPEG_CMD_MODE_OP__SHIFT 24
+#define NV17_MPEG_CMD_MODE_OP_MODE 0x32000000
+#define NV17_MPEG_CMD_IQ_SETUP_QUANT_SCALE__MASK 0x000001fe
+#define NV17_MPEG_CMD_IQ_SETUP_QUANT_SCALE__SHIFT 1
+#define NV17_MPEG_CMD_IQ_SETUP_INTRA_DC_MULT__MASK 0x00001e00
+#define NV17_MPEG_CMD_IQ_SETUP_INTRA_DC_MULT__SHIFT 9
+#define NV17_MPEG_CMD_IQ_SETUP_UNK13__MASK 0x00006000
+#define NV17_MPEG_CMD_IQ_SETUP_UNK13__SHIFT 13
+#define NV17_MPEG_CMD_IQ_SETUP_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_IQ_SETUP_OP__SHIFT 28
+#define NV17_MPEG_CMD_IQ_SETUP_OP_IQ_SETUP 0x40000000
+#define NV17_MPEG_CMD_IQ_MATRIX_INTRA 0x00000001
+#define NV17_MPEG_CMD_IQ_MATRIX_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_IQ_MATRIX_OP__SHIFT 28
+#define NV17_MPEG_CMD_IQ_MATRIX_OP_IQ_MATRIX 0x50000000
+#define NV17_MPEG_CMD_BLOCK_DATA_INTRA 0x00000001
+#define NV17_MPEG_CMD_BLOCK_DATA_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_BLOCK_DATA_OP__SHIFT 28
+#define NV17_MPEG_CMD_BLOCK_DATA_OP_BLOCK_DATA 0x60000000
+#define NV17_MPEG_BLOCK_DATA_LAST 0x00000001
+#define NV17_MPEG_BLOCK_DATA_IDX__MASK 0x0000003e
+#define NV17_MPEG_BLOCK_DATA_IDX__SHIFT 1
+#define NV17_MPEG_BLOCK_DATA_IDX__SHR 1
+#define NV17_MPEG_BLOCK_DATA_COORD1__MASK 0x0003ffc0
+#define NV17_MPEG_BLOCK_DATA_COORD1__SHIFT 6
+#define NV17_MPEG_BLOCK_DATA_COORD1_FORCE_0 0x00010000
+#define NV17_MPEG_BLOCK_DATA_COORD0__MASK 0x7ff80000
+#define NV17_MPEG_BLOCK_DATA_COORD0__SHIFT 19
+#define NV17_MPEG_BLOCK_DATA_COORD0_FORCE_0 0x80000000
+#define NV17_MPEG_CMD_SYNC_INTR 0x00000001
+#define NV17_MPEG_CMD_SYNC_OP__MASK 0xff000000
+#define NV17_MPEG_CMD_SYNC_OP__SHIFT 24
+#define NV17_MPEG_CMD_SYNC_OP_SYNC 0x70000000
+#define NV17_MPEG_CMD_SEQUENCE_OP__MASK 0xff000000
+#define NV17_MPEG_CMD_SEQUENCE_OP__SHIFT 24
+#define NV17_MPEG_CMD_SEQUENCE_OP_SEQUENCE 0x71000000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_X_COORD__MASK 0x00008000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_X_COORD__SHIFT 15
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_X_COORD_ODD 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_X_COORD_EVEN 0x00008000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_RUN__MASK 0x00010000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_RUN__SHIFT 16
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_RUN_DOUBLE 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_RUN_SINGLE 0x00010000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_FIELD__MASK 0x00020000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_FIELD__SHIFT 17
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_FIELD_TOP 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_FIELD_BOTTOM 0x00020000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_TYPE__MASK 0x00080000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_TYPE__SHIFT 19
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_TYPE_FIELD 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_TYPE_FRAME 0x00080000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_SURFACE__MASK 0x00700000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_SURFACE__SHIFT 20
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_FRAME_DCT_TYPE__MASK 0x00800000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_FRAME_DCT_TYPE__SHIFT 23
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_FRAME_DCT_TYPE_FRAME 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_FRAME_DCT_TYPE_FIELD 0x00800000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_CBP__MASK 0x0c000000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_CBP__SHIFT 26
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_OP__SHIFT 28
+#define NV17_MPEG_CMD_CHROMA_MB_HEADER_OP_CHROMA_MB_HEADER 0x80000000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_X_COORD__MASK 0x00008000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_X_COORD__SHIFT 15
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_X_COORD_ODD 0x00000000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_X_COORD_EVEN 0x00008000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_RUN__MASK 0x00010000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_RUN__SHIFT 16
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_RUN_DOUBLE 0x00000000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_RUN_SINGLE 0x00010000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_FIELD__MASK 0x00020000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_FIELD__SHIFT 17
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_FIELD_TOP 0x00000000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_FIELD_BOTTOM 0x00020000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_TYPE__MASK 0x00080000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_TYPE__SHIFT 19
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_TYPE_FIELD 0x00000000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_TYPE_FRAME 0x00080000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_SURFACE__MASK 0x00700000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_SURFACE__SHIFT 20
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_FRAME_DCT_TYPE__MASK 0x00800000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_FRAME_DCT_TYPE__SHIFT 23
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_FRAME_DCT_TYPE_FRAME 0x00000000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_FRAME_DCT_TYPE_FIELD 0x00800000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_CBP__MASK 0x0f000000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_CBP__SHIFT 24
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_OP__SHIFT 28
+#define NV17_MPEG_CMD_LUMA_MB_HEADER_OP_LUMA_MB_HEADER 0x90000000
+#define NV17_MPEG_CMD_MB_COORDS_X__MASK 0x000007ff
+#define NV17_MPEG_CMD_MB_COORDS_X__SHIFT 0
+#define NV17_MPEG_CMD_MB_COORDS_Y__MASK 0x007ff000
+#define NV17_MPEG_CMD_MB_COORDS_Y__SHIFT 12
+#define NV17_MPEG_CMD_MB_COORDS_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_MB_COORDS_OP__SHIFT 28
+#define NV17_MPEG_CMD_MB_COORDS_OP_MB_COORDS 0xa0000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_COUNT__MASK 0x00010000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_COUNT__SHIFT 16
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_COUNT_1 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_COUNT_2 0x00010000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_FIELD__MASK 0x00020000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_FIELD__SHIFT 17
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_FIELD_TOP 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_FIELD_BOTTOM 0x00020000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_TYPE__MASK 0x00080000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_TYPE__SHIFT 19
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_TYPE_FIELD 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_TYPE_FRAME 0x00080000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_SURFACE__MASK 0x00700000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_SURFACE__SHIFT 20
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_IDX 0x00800000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_MV_SPLIT__MASK 0x01000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_MV_SPLIT__SHIFT 24
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_MV_SPLIT_FIELD 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_MV_SPLIT_HALF_MB 0x01000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_Y_HALF 0x02000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_X_HALF 0x04000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_DIRECTION__MASK 0x08000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_DIRECTION__SHIFT 27
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_DIRECTION_FORWARD 0x00000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_DIRECTION_BACKWARD 0x08000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_OP__SHIFT 28
+#define NV17_MPEG_CMD_CHROMA_MV_HEADER_OP_CHROMA_MV_HEADER 0xc0000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_COUNT__MASK 0x00010000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_COUNT__SHIFT 16
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_COUNT_1 0x00000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_COUNT_2 0x00010000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_FIELD__MASK 0x00020000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_FIELD__SHIFT 17
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_FIELD_TOP 0x00000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_FIELD_BOTTOM 0x00020000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_TYPE__MASK 0x00080000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_TYPE__SHIFT 19
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_TYPE_FIELD 0x00000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_TYPE_FRAME 0x00080000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_SURFACE__MASK 0x00700000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_SURFACE__SHIFT 20
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_IDX 0x00800000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_MV_SPLIT__MASK 0x01000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_MV_SPLIT__SHIFT 24
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_MV_SPLIT_FIELD 0x00000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_MV_SPLIT_HALF_MB 0x01000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_Y_HALF 0x02000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_X_HALF 0x04000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_DIRECTION__MASK 0x08000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_DIRECTION__SHIFT 27
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_DIRECTION_FORWARD 0x00000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_DIRECTION_BACKWARD 0x08000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_OP__SHIFT 28
+#define NV17_MPEG_CMD_LUMA_MV_HEADER_OP_LUMA_MV_HEADER 0xd0000000
+#define NV17_MPEG_CMD_MV_COORDS_X__MASK 0x000007ff
+#define NV17_MPEG_CMD_MV_COORDS_X__SHIFT 0
+#define NV17_MPEG_CMD_MV_COORDS_Y__MASK 0x007ff000
+#define NV17_MPEG_CMD_MV_COORDS_Y__SHIFT 12
+#define NV17_MPEG_CMD_MV_COORDS_OP__MASK 0xf0000000
+#define NV17_MPEG_CMD_MV_COORDS_OP__SHIFT 28
+#define NV17_MPEG_CMD_MV_COORDS_OP_MV_COORDS 0xe0000000
+
+#endif /* ___RNNDB_NV17_MPEG_XML */
diff --git a/src/gallium/drivers/nouveau/nv31_mpeg.xml.h b/src/gallium/drivers/nouveau/nv31_mpeg.xml.h
new file mode 100644
index 0000000..a8c1e32
--- /dev/null
+++ b/src/gallium/drivers/nouveau/nv31_mpeg.xml.h
@@ -0,0 +1,130 @@
+#ifndef ___RNNDB_NV31_MPEG_XML
+#define ___RNNDB_NV31_MPEG_XML
+
+/* Autogenerated file, DO NOT EDIT manually!
+
+This file was generated by the rules-ng-ng headergen tool in this git repository:
+http://0x04.net/cgit/index.cgi/rules-ng-ng
+git clone git://0x04.net/rules-ng-ng
+
+The rules-ng-ng source files this header was generated from are:
+- ../rnndb/nv31_mpeg.xml ( 2269 bytes, from 2011-08-02 11:17:20)
+- ../rnndb/copyright.xml ( 6452 bytes, from 2011-07-15 12:42:43)
+- ../rnndb/nvchipsets.xml ( 3617 bytes, from 2011-07-22 11:37:48)
+- ../rnndb/nv_object.xml ( 12672 bytes, from 2011-07-15 12:42:43)
+- ../rnndb/nv_defs.xml ( 4437 bytes, from 2011-07-15 12:42:43)
+- ../rnndb/nv50_defs.xml ( 5468 bytes, from 2011-07-15 12:42:43)
+
+Copyright (C) 2006-2011 by the following authors:
+- Artur Huillet <arthur.huillet@free.fr> (ahuillet)
+- Ben Skeggs (darktama, darktama_)
+- B. R. <koala_br@users.sourceforge.net> (koala_br)
+- Carlos Martin <carlosmn@users.sf.net> (carlosmn)
+- Christoph Bumiller <e0425955@student.tuwien.ac.at> (calim, chrisbmr)
+- Dawid Gajownik <gajownik@users.sf.net> (gajownik)
+- Dmitry Baryshkov
+- Dmitry Eremin-Solenikov <lumag@users.sf.net> (lumag)
+- EdB <edb_@users.sf.net> (edb_)
+- Erik Waling <erikwailing@users.sf.net> (erikwaling)
+- Francisco Jerez <currojerez@riseup.net> (curro)
+- imirkin <imirkin@users.sf.net> (imirkin)
+- jb17bsome <jb17bsome@bellsouth.net> (jb17bsome)
+- Jeremy Kolb <kjeremy@users.sf.net> (kjeremy)
+- Laurent Carlier <lordheavym@gmail.com> (lordheavy)
+- Luca Barbieri <luca@luca-barbieri.com> (lb, lb1)
+- Maarten Maathuis <madman2003@gmail.com> (stillunknown)
+- Marcin Koƛcielnicki <koriakin@0x04.net> (mwk, koriakin)
+- Mark Carey <mark.carey@gmail.com> (careym)
+- Matthieu Castet <matthieu.castet@parrot.com> (mat-c)
+- nvidiaman <nvidiaman@users.sf.net> (nvidiaman)
+- Patrice Mandin <patmandin@gmail.com> (pmandin, pmdata)
+- Pekka Paalanen <pq@iki.fi> (pq, ppaalanen)
+- Peter Popov <ironpeter@users.sf.net> (ironpeter)
+- Richard Hughes <hughsient@users.sf.net> (hughsient)
+- Rudi Cilibrasi <cilibrar@users.sf.net> (cilibrar)
+- Serge Martin
+- Simon Raffeiner
+- Stephane Loeuillet <leroutier@users.sf.net> (leroutier)
+- Stephane Marchesin <stephane.marchesin@gmail.com> (marcheu)
+- sturmflut <sturmflut@users.sf.net> (sturmflut)
+- Sylvain Munaut <tnt@246tNt.com>
+- Victor Stinner <victor.stinner@haypocalc.com> (haypo)
+- Wladmir van der Laan <laanwj@gmail.com> (miathan6)
+- Younes Manton <younes.m@gmail.com> (ymanton)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+
+
+#define NV31_MPEG_PITCH 0x00000160
+#define NV31_MPEG_PITCH_PITCH__MASK 0x00001fff
+#define NV31_MPEG_PITCH_PITCH__SHIFT 0
+#define NV31_MPEG_PITCH_UNK 0x00010000
+
+#define NV31_MPEG_SIZE 0x00000164
+#define NV31_MPEG_SIZE_W__MASK 0x0000ffff
+#define NV31_MPEG_SIZE_W__SHIFT 0
+#define NV31_MPEG_SIZE_H__MASK 0xffff0000
+#define NV31_MPEG_SIZE_H__SHIFT 16
+
+#define NV31_MPEG_DMA_CMD 0x00000190
+
+#define NV31_MPEG_DMA_DATA 0x000001a0
+
+#define NV31_MPEG_DMA_IMAGE 0x000001b0
+
+#define NV84_MPEG_DMA_QUERY 0x000001c0
+
+#define NV31_MPEG_IMAGE_Y_OFFSET(i0) (0x00000200 + 0x8*(i0))
+#define NV31_MPEG_IMAGE_Y_OFFSET__ESIZE 0x00000008
+#define NV31_MPEG_IMAGE_Y_OFFSET__LEN 0x00000008
+
+#define NV31_MPEG_IMAGE_C_OFFSET(i0) (0x00000204 + 0x8*(i0))
+#define NV31_MPEG_IMAGE_C_OFFSET__ESIZE 0x00000008
+#define NV31_MPEG_IMAGE_C_OFFSET__LEN 0x00000008
+
+#define NV31_MPEG_FORMAT 0x00000310
+#define NV31_MPEG_FORMAT_DATA_FORMAT__MASK 0x00000001
+#define NV31_MPEG_FORMAT_DATA_FORMAT__SHIFT 0
+#define NV31_MPEG_FORMAT_DATA_FORMAT_S16 0x00000000
+#define NV31_MPEG_FORMAT_DATA_FORMAT_S8 0x00000001
+#define NV31_MPEG_FORMAT_UNK8 0x00000100
+
+#define NV31_MPEG_IDCT_ENABLE 0x00000314
+
+
+#define NV84_MPEG_QUERY_OFFSET 0x0000031c
+
+#define NV84_MPEG_QUERY_COUNTER 0x00000320
+
+#define NV31_MPEG_CMD_OFFSET 0x00000380
+
+#define NV31_MPEG_CMD_SIZE 0x00000384
+
+#define NV31_MPEG_DATA_OFFSET 0x0000038c
+
+#define NV31_MPEG_DATA_SIZE 0x00000390
+
+#define NV31_MPEG_EXEC 0x00000394
+
+
+#endif /* ___RNNDB_NV31_MPEG_XML */
diff --git a/src/gallium/drivers/nvfx/nvfx_context.c b/src/gallium/drivers/nvfx/nvfx_context.c
index e2cdcf6..37425b1 100644
--- a/src/gallium/drivers/nvfx/nvfx_context.c
+++ b/src/gallium/drivers/nvfx/nvfx_context.c
@@ -90,9 +90,6 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
nvfx->pipe.clear = nvfx_clear;
nvfx->pipe.flush = nvfx_flush;
- nvfx->pipe.create_video_decoder = vl_create_decoder;
- nvfx->pipe.create_video_buffer = vl_video_buffer_create;
-
nvfx->is_nv4x = screen->is_nv4x;
nvfx->use_nv4x = screen->use_nv4x;
/* TODO: it seems that nv30 might have fixed function clipping usable with vertex programs
@@ -126,6 +123,7 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
nvfx->relocs_needed = NVFX_RELOCATE_ALL;
LIST_INITHEAD(&nvfx->render_cache);
+ nvfx_context_init_vdec(nvfx);
return &nvfx->pipe;
}
diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h
index dad912b..cb40a52 100644
--- a/src/gallium/drivers/nvfx/nvfx_context.h
+++ b/src/gallium/drivers/nvfx/nvfx_context.h
@@ -340,6 +340,8 @@ extern void nvfx_init_vertprog_functions(struct nvfx_context *nvfx);
/* nvfx_push.c */
extern void nvfx_push_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info);
+extern void nvfx_context_init_vdec(struct nvfx_context *);
+
static inline void nvfx_emit_vtx_attr(struct nouveau_channel* chan,
struct nouveau_grobj *eng3d, unsigned attrib, const float* v,
unsigned ncomp)