From f94cfdc5f2724d7fc92ad1c5d2127b884e7892ff Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Mon, 17 Apr 2017 12:37:44 -0400 Subject: radeonsi: enable vcn decode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leo Liu Reviewed-by: Christian König --- src/gallium/drivers/radeonsi/si_uvd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c index 53a7ce9402c..d17a6656a46 100644 --- a/src/gallium/drivers/radeonsi/si_uvd.c +++ b/src/gallium/drivers/radeonsi/si_uvd.c @@ -35,6 +35,7 @@ #include "radeon/radeon_video.h" #include "radeon/radeon_uvd.h" #include "radeon/radeon_vce.h" +#include "radeon/radeon_vcn_dec.h" /** * creates an video buffer with an UVD compatible memory layout @@ -156,9 +157,11 @@ struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context, const struct pipe_video_codec *templ) { struct si_context *ctx = (struct si_context *)context; + bool vcn = (ctx->b.family == CHIP_RAVEN) ? true : false; 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); + return (vcn) ? radeon_create_decoder(context, templ) : + ruvd_create_decoder(context, templ, si_uvd_set_dtb); } -- cgit v1.2.3