summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/r600_uvd.c
diff options
context:
space:
mode:
authorChristian König <[email protected]>2015-10-11 20:13:25 +0200
committerChristian König <[email protected]>2015-10-13 14:32:52 +0200
commit685335639a982b398d305b8f314fc3857fcdbead (patch)
tree46d75ba34bb7e92613457b6a2b540e6ebd195e9e /src/gallium/drivers/r600/r600_uvd.c
parent83de93309e38ce3af0c8f92ef54446db70b2cb38 (diff)
r600/vce: enable VCE for trinity/richland
Signed-off-by: Christian König <[email protected]> Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_uvd.c')
-rw-r--r--src/gallium/drivers/r600/r600_uvd.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_uvd.c b/src/gallium/drivers/r600/r600_uvd.c
index 3a94a5a95ec..e2e9033ea2c 100644
--- a/src/gallium/drivers/r600/r600_uvd.c
+++ b/src/gallium/drivers/r600/r600_uvd.c
@@ -47,6 +47,7 @@
#include "r600_pipe.h"
#include "radeon/radeon_video.h"
#include "radeon/radeon_uvd.h"
+#include "radeon/radeon_vce.h"
#include "r600d.h"
#define R600_UVD_ENABLE_TILING 0
@@ -168,9 +169,28 @@ static struct radeon_winsys_cs_handle* r600_uvd_set_dtb(struct ruvd_msg *msg, st
return luma->resource.cs_buf;
}
+/* get the radeon resources for VCE */
+static void r600_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;
+}
+
/* create decoder */
struct pipe_video_codec *r600_uvd_create_decoder(struct pipe_context *context,
- const struct pipe_video_codec *templat)
+ const struct pipe_video_codec *templat)
{
+ struct r600_context *ctx = (struct r600_context *)context;
+
+ if (templat->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE)
+ return rvce_create_encoder(context, templat, ctx->b.ws, r600_vce_get_buffer);
+
return ruvd_create_decoder(context, templat, r600_uvd_set_dtb);
}