radeon/vcn: separate send cmd call from end frame

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>

diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c b/src/gallium/drivers/radeon/radeon_vcn_dec.c
index 26ea1f82ff94d5b9f091ec86c0273b50aae373b5..30a98c278672c2893438173e6a583bea726605a6 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c
@@ -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:

diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.h b/src/gallium/drivers/radeon/radeon_vcn_dec.h
index 2bcc1bb542be6529f2b42ba43dec1468c3ff53b4..37c050337710557fd206d8b2e3a1dc460a242365 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vcn_dec.h
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.h
@@ -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);