radeonsi: print export_prim_id from the shader key

[mesa.git] / src / gallium / drivers / radeonsi / si_uvd.c

diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c
index 397c697ae24f94ae7315f9c77d573621613559da..2f10f9ba813acb04ce26376336a9deab20544761 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_uvd.c
+++ b/src/gallium/drivers/radeonsi/si_uvd.c
@@ -31,32 +31,20 @@
  *
  */
 
-#include <sys/types.h>
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include "pipe/p_video_codec.h"
-
-#include "util/u_memory.h"
-#include "util/u_video.h"
-
-#include "vl/vl_defines.h"
-#include "vl/vl_mpeg12_decoder.h"
-
 #include "si_pipe.h"
+#include "radeon/radeon_video.h"
 #include "radeon/radeon_uvd.h"
-#include "sid.h"
+#include "radeon/radeon_vce.h"
 
 /**
  * creates an video buffer with an UVD compatible memory layout
  */
-struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe,
-                                                      const struct pipe_video_buffer *tmpl)
+struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe,
+                                                const struct pipe_video_buffer *tmpl)
 {
        struct si_context *ctx = (struct si_context *)pipe;
        struct r600_texture *resources[VL_NUM_COMPONENTS] = {};
-       struct radeon_surface *surfaces[VL_NUM_COMPONENTS] = {};
+       struct radeon_surf *surfaces[VL_NUM_COMPONENTS] = {};
        struct pb_buffer **pbs[VL_NUM_COMPONENTS] = {};
        const enum pipe_format *resource_formats;
        struct pipe_video_buffer template;
@@ -75,7 +63,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe
        template.width = align(tmpl->width, VL_MACROBLOCK_WIDTH);
        template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT);
 
-       vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_STATIC, 0);
+       vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_DEFAULT, 0);
        /* TODO: get tiling working */
        templ.bind = PIPE_BIND_LINEAR;
        resources[0] = (struct r600_texture *)
@@ -84,7 +72,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe
                goto error;
 
        if (resource_formats[1] != PIPE_FORMAT_NONE) {
-               vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_STATIC, 1);
+               vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_DEFAULT, 1);
                templ.bind = PIPE_BIND_LINEAR;
                resources[1] = (struct r600_texture *)
                        pipe->screen->resource_create(pipe->screen, &templ);
@@ -93,7 +81,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe
        }
 
        if (resource_formats[2] != PIPE_FORMAT_NONE) {
-               vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_STATIC, 2);
+               vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_DEFAULT, 2);
                templ.bind = PIPE_BIND_LINEAR;
                resources[2] = (struct r600_texture *)
                        pipe->screen->resource_create(pipe->screen, &templ);
@@ -109,7 +97,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe
                pbs[i] = &resources[i]->resource.buf;
        }
 
-       ruvd_join_surfaces(ctx->b.ws, templ.bind, pbs, surfaces);
+       rvid_join_surfaces(ctx->b.ws, templ.bind, pbs, surfaces);
 
        for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
                if (!resources[i])
@@ -118,6 +106,8 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe
                /* recreate the CS handle */
                resources[i]->resource.cs_buf = ctx->b.ws->buffer_get_cs_handle(
                        resources[i]->resource.buf);
+               resources[i]->resource.gpu_address = ctx->b.ws->buffer_get_virtual_address(
+                       resources[i]->resource.cs_buf);
        }
 
        template.height *= array_size;
@@ -131,7 +121,7 @@ error:
 }
 
 /* set the decoding target buffer offsets */
-static struct radeon_winsys_cs_handle* radeonsi_uvd_set_dtb(struct ruvd_msg *msg, struct vl_video_buffer *buf)
+static struct radeon_winsys_cs_handle* si_uvd_set_dtb(struct ruvd_msg *msg, struct vl_video_buffer *buf)
 {
        struct r600_texture *luma = (struct r600_texture *)buf->resources[0];
        struct r600_texture *chroma = (struct r600_texture *)buf->resources[1];
@@ -143,11 +133,30 @@ static struct radeon_winsys_cs_handle* radeonsi_uvd_set_dtb(struct ruvd_msg *msg
        return luma->resource.cs_buf;
 }
 
+/* get the radeon resources for VCE */
+static void si_vce_get_buffer(struct pipe_resource *resource,
+                             struct radeon_winsys_cs_handle **handle,
+                             struct radeon_surf **surface)
+{
+       struct r600_texture *res = (struct r600_texture *)resource;
+
+       if (handle)
+               *handle = res->resource.cs_buf;
+
+       if (surface)
+               *surface = &res->surface;
+}
+
 /**
  * creates an UVD compatible decoder
  */
-struct pipe_video_codec *radeonsi_uvd_create_decoder(struct pipe_context *context,
-                                                    const struct pipe_video_codec *templ)
+struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context,
+                                              const struct pipe_video_codec *templ)
 {
-       return ruvd_create_decoder(context, templ, radeonsi_uvd_set_dtb);
+       struct si_context *ctx = (struct si_context *)context;
+
+        if (templ->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE)
+                return rvce_create_encoder(context, templ, ctx->b.ws, si_vce_get_buffer);
+
+       return ruvd_create_decoder(context, templ, si_uvd_set_dtb);
 }