AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeon/vcn: separate send cmd call from end frame

Browse Source 
Use function pointer for sending cmd in end_frame call. By doing this, we can
assign different cmd sending logics for Jpeg decode later.

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
This commit is contained in:
Boyuan Zhang
2018-10-17 15:03:22 -04:00
committed by Leo Liu
parent 4f1f128f8e
commit 40fceb55f3
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeon/radeon_vcn_dec.c
+21 -8
View File
@@ -1368,21 +1368,15 @@ static void radeon_dec_decode_bitstream(struct pipe_video_codec *decoder,
}
/**
* end decoding of the current frame
* send cmd for vcn dec
*/
static void radeon_dec_end_frame(struct pipe_video_codec *decoder,
void send_cmd_dec(struct radeon_decoder *dec,
struct pipe_video_buffer *target,
struct pipe_picture_desc *picture)
{
struct radeon_decoder *dec = (struct radeon_decoder*)decoder;
struct pb_buffer *dt;
struct rvid_buffer *msg_fb_it_probs_buf, *bs_buf;
assert(decoder);
if (!dec->bs_ptr)
return;
msg_fb_it_probs_buf = &dec->msg_fb_it_probs_buffers[dec->cur_buffer];
bs_buf = &dec->bs_buffers[dec->cur_buffer];
@@ -1412,6 +1406,23 @@ static void radeon_dec_end_frame(struct pipe_video_codec *decoder,
send_cmd(dec, RDECODE_CMD_PROB_TBL_BUFFER, msg_fb_it_probs_buf->res->buf,
FB_BUFFER_OFFSET + FB_BUFFER_SIZE, RADEON_USAGE_READ, RADEON_DOMAIN_GTT);
set_reg(dec, RDECODE_ENGINE_CNTL, 1);
}
/**
* end decoding of the current frame
*/
static void radeon_dec_end_frame(struct pipe_video_codec *decoder,
struct pipe_video_buffer *target,
struct pipe_picture_desc *picture)
{
struct radeon_decoder *dec = (struct radeon_decoder*)decoder;
assert(decoder);
if (!dec->bs_ptr)
return;
dec->send_cmd(dec, target, picture);
flush(dec, PIPE_FLUSH_ASYNC);
next_buffer(dec);
@@ -1570,6 +1581,8 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
next_buffer(dec);
dec->send_cmd = send_cmd_dec;
return &dec->base;
error:
src/gallium/drivers/radeon/radeon_vcn_dec.h
+7
View File
@@ -759,8 +759,15 @@ struct radeon_decoder {
bool show_frame;
unsigned ref_idx;
struct jpeg_params jpg;
void (*send_cmd)(struct radeon_decoder *dec,
struct pipe_video_buffer *target,
struct pipe_picture_desc *picture);
};
void send_cmd_dec(struct radeon_decoder *dec,
struct pipe_video_buffer *target,
struct pipe_picture_desc *picture);
struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
const struct pipe_video_codec *templat);