r600g: remove DMA padding

[mesa.git] / src / gallium / drivers / r600 / r600_uvd.c

diff --git a/src/gallium/drivers/r600/r600_uvd.c b/src/gallium/drivers/r600/r600_uvd.c
index dafddfa27a84f17a2c0e608df01445e88d226c15..eeac76f3e2340278bd92ebdcb252edf19569f765 100644 (file)
--- a/src/gallium/drivers/r600/r600_uvd.c
+++ b/src/gallium/drivers/r600/r600_uvd.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "pipe/p_video_decoder.h"
+#include "pipe/p_video_codec.h"
 
 #include "util/u_memory.h"
 #include "util/u_video.h"
@@ -61,7 +61,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
        const enum pipe_format *resource_formats;
        struct pipe_video_buffer template;
        struct pipe_resource templ;
-       unsigned i, depth;
+       unsigned i, array_size;
 
        assert(pipe);
 
@@ -70,13 +70,13 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
        if (!resource_formats)
                return NULL;
 
-       depth = tmpl->interlaced ? 2 : 1;
+       array_size = tmpl->interlaced ? 2 : 1;
        template = *tmpl;
        template.width = align(tmpl->width, VL_MACROBLOCK_WIDTH);
-       template.height = align(tmpl->height / depth, VL_MACROBLOCK_HEIGHT);
+       template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT);
 
-       vl_vide_buffer_template(&templ, &template, resource_formats[0], depth, PIPE_USAGE_STATIC, 0);
-       if (ctx->chip_class < EVERGREEN)
+       vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_STATIC, 0);
+       if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
                templ.flags = R600_RESOURCE_FLAG_TRANSFER;
        resources[0] = (struct r600_texture *)
                pipe->screen->resource_create(pipe->screen, &templ);
@@ -84,8 +84,8 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
                goto error;
 
        if (resource_formats[1] != PIPE_FORMAT_NONE) {
-               vl_vide_buffer_template(&templ, &template, resource_formats[1], depth, PIPE_USAGE_STATIC, 1);
-               if (ctx->chip_class < EVERGREEN)
+               vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_STATIC, 1);
+               if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
                        templ.flags = R600_RESOURCE_FLAG_TRANSFER;
                resources[1] = (struct r600_texture *)
                        pipe->screen->resource_create(pipe->screen, &templ);
@@ -94,8 +94,8 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
        }
 
        if (resource_formats[2] != PIPE_FORMAT_NONE) {
-               vl_vide_buffer_template(&templ, &template, resource_formats[2], depth, PIPE_USAGE_STATIC, 2);
-               if (ctx->chip_class < EVERGREEN)
+               vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_STATIC, 2);
+               if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
                        templ.flags = R600_RESOURCE_FLAG_TRANSFER;
                resources[2] = (struct r600_texture *)
                        pipe->screen->resource_create(pipe->screen, &templ);
@@ -111,18 +111,18 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
                surfaces[i] = &resources[i]->surface;
        }
 
-       ruvd_join_surfaces(ctx->ws, templ.bind, pbs, surfaces);
+       ruvd_join_surfaces(ctx->b.ws, templ.bind, pbs, surfaces);
 
        for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
                if (!resources[i])
                        continue;
 
                /* recreate the CS handle */
-               resources[i]->resource.cs_buf = ctx->ws->buffer_get_cs_handle(
+               resources[i]->resource.cs_buf = ctx->b.ws->buffer_get_cs_handle(
                        resources[i]->resource.buf);
        }
 
-       template.height *= depth;
+       template.height *= array_size;
        return vl_video_buffer_create_ex2(pipe, &template, (struct pipe_resource **)resources);
 
 error:
@@ -155,8 +155,8 @@ static struct radeon_winsys_cs_handle* r600_uvd_set_dtb(struct ruvd_msg *msg, st
        struct r600_texture *luma = (struct r600_texture *)buf->resources[0];
        struct r600_texture *chroma = (struct r600_texture *)buf->resources[1];
 
-       msg->decode.dt_field_mode = buf->base.interlaced;
-       msg->decode.dt_surf_tile_config |= RUVD_NUM_BANKS(eg_num_banks(rscreen->tiling_info.num_banks));
+       msg->body.decode.dt_field_mode = buf->base.interlaced;
+       msg->body.decode.dt_surf_tile_config |= RUVD_NUM_BANKS(eg_num_banks(rscreen->tiling_info.num_banks));
 
        ruvd_set_dt_surfaces(msg, &luma->surface, &chroma->surface);
 
@@ -164,16 +164,36 @@ static struct radeon_winsys_cs_handle* r600_uvd_set_dtb(struct ruvd_msg *msg, st
 }
 
 /* create decoder */
-struct pipe_video_decoder *r600_uvd_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,
-                                                  unsigned max_references, bool expect_chunked_decode)
+struct pipe_video_codec *r600_uvd_create_decoder(struct pipe_context *context,
+                                                  const struct pipe_video_codec *templat)
 {
        struct r600_context *ctx = (struct r600_context *)context;
 
-       return ruvd_create_decoder(context, profile, entrypoint, chroma_format,
-                                  width, height, max_references, expect_chunked_decode,
-                                  ctx->ws, r600_uvd_set_dtb);
+       return ruvd_create_decoder(context, templat, ctx->b.ws, r600_uvd_set_dtb);
+}
+
+int r600_uvd_get_video_param(struct pipe_screen *screen,
+                            enum pipe_video_profile profile,
+                            enum pipe_video_entrypoint entrypoint,
+                            enum pipe_video_cap param)
+{
+       struct r600_screen *rscreen = (struct r600_screen *)screen;
+
+       /* UVD 2.x limits */
+       if (rscreen->b.family < CHIP_PALM) {
+               enum pipe_video_format codec = u_reduce_video_profile(profile);
+               switch (param) {
+               case PIPE_VIDEO_CAP_SUPPORTED:
+                       /* no support for MPEG4 */
+                       return codec != PIPE_VIDEO_FORMAT_MPEG4;
+               case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
+               case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
+                       /* and MPEG2 only with shaders */
+                       return codec != PIPE_VIDEO_FORMAT_MPEG12;
+               default:
+                       break;
+               }
+       }
+
+       return ruvd_get_video_param(screen, profile, entrypoint, param);
 }