On Mon, Oct 12, 2015 at 4:53 AM, Christian König <deathsim...@vodafone.de> wrote: > From: Christian König <christian.koe...@amd.com> > > Signed-off-by: Christian König <christian.koe...@amd.com>
For the series: Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> > --- > src/gallium/drivers/r600/r600_uvd.c | 22 +++++++++++++++++++++- > 1 file changed, 21 insertions(+), 1 deletion(-) > > diff --git a/src/gallium/drivers/r600/r600_uvd.c > b/src/gallium/drivers/r600/r600_uvd.c > index 3a94a5a..e2e9033 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); > } > -- > 1.9.1 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev