media: hantro: Avoid redundant hantro_get_{dst,src}_buf() calls

Getting the next src/dst buffer is relatively expensive
so avoid doing it multiple times.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Tested-by: Alex Bee <knaerzche@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
index 5c792b7..2aa37ba 100644 (file)
--- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c
+++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
@@ -19,13 +19,12 @@
 #include "hantro_hw.h"
 #include "hantro_v4l2.h"
 
-static void set_params(struct hantro_ctx *ctx)
+static void set_params(struct hantro_ctx *ctx, struct vb2_v4l2_buffer *src_buf)
 {
        const struct hantro_h264_dec_ctrls *ctrls = &ctx->h264_dec.ctrls;
        const struct v4l2_ctrl_h264_decode_params *dec_param = ctrls->decode;
        const struct v4l2_ctrl_h264_sps *sps = ctrls->sps;
        const struct v4l2_ctrl_h264_pps *pps = ctrls->pps;
-       struct vb2_v4l2_buffer *src_buf = hantro_get_src_buf(ctx);
        struct hantro_dev *vpu = ctx->dev;
        u32 reg;
 
@@ -226,22 +225,20 @@ static void set_ref(struct hantro_ctx *ctx)
        }
 }
 
-static void set_buffers(struct hantro_ctx *ctx)
+static void set_buffers(struct hantro_ctx *ctx, struct vb2_v4l2_buffer *src_buf)
 {
        const struct hantro_h264_dec_ctrls *ctrls = &ctx->h264_dec.ctrls;
-       struct vb2_v4l2_buffer *src_buf, *dst_buf;
+       struct vb2_v4l2_buffer *dst_buf;
        struct hantro_dev *vpu = ctx->dev;
        dma_addr_t src_dma, dst_dma;
        size_t offset = 0;
 
-       src_buf = hantro_get_src_buf(ctx);
-       dst_buf = hantro_get_dst_buf(ctx);
-
        /* Source (stream) buffer. */
        src_dma = vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
        vdpu_write_relaxed(vpu, src_dma, G1_REG_ADDR_STR);
 
        /* Destination (decoded frame) buffer. */
+       dst_buf = hantro_get_dst_buf(ctx);
        dst_dma = hantro_get_dec_buf_addr(ctx, &dst_buf->vb2_buf);
        /* Adjust dma addr to start at second line for bottom field */
        if (ctrls->decode->flags & V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD)
@@ -276,6 +273,7 @@ static void set_buffers(struct hantro_ctx *ctx)
 int hantro_g1_h264_dec_run(struct hantro_ctx *ctx)
 {
        struct hantro_dev *vpu = ctx->dev;
+       struct vb2_v4l2_buffer *src_buf;
        int ret;
 
        /* Prepare the H264 decoder context. */
@@ -284,9 +282,10 @@ int hantro_g1_h264_dec_run(struct hantro_ctx *ctx)
                return ret;
 
        /* Configure hardware registers. */
-       set_params(ctx);
+       src_buf = hantro_get_src_buf(ctx);
+       set_params(ctx, src_buf);
        set_ref(ctx);
-       set_buffers(ctx);
+       set_buffers(ctx, src_buf);
 
        hantro_end_prepare_run(ctx);
 

diff --git a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
index 2afd599..6180b23 100644 (file)
--- a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
+++ b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
@@ -367,13 +367,12 @@ static void cfg_tap(struct hantro_ctx *ctx,
 }
 
 static void cfg_ref(struct hantro_ctx *ctx,
-                   const struct v4l2_ctrl_vp8_frame *hdr)
+                   const struct v4l2_ctrl_vp8_frame *hdr,
+                   struct vb2_v4l2_buffer *vb2_dst)
 {
        struct hantro_dev *vpu = ctx->dev;
-       struct vb2_v4l2_buffer *vb2_dst;
        dma_addr_t ref;
 
-       vb2_dst = hantro_get_dst_buf(ctx);
 
        ref = hantro_get_ref(ctx, hdr->last_frame_ts);
        if (!ref) {
@@ -405,16 +404,14 @@ static void cfg_ref(struct hantro_ctx *ctx,
 }
 
 static void cfg_buffers(struct hantro_ctx *ctx,
-                       const struct v4l2_ctrl_vp8_frame *hdr)
+                       const struct v4l2_ctrl_vp8_frame *hdr,
+                       struct vb2_v4l2_buffer *vb2_dst)
 {
        const struct v4l2_vp8_segment *seg = &hdr->segment;
        struct hantro_dev *vpu = ctx->dev;
-       struct vb2_v4l2_buffer *vb2_dst;
        dma_addr_t dst_dma;
        u32 reg;
 
-       vb2_dst = hantro_get_dst_buf(ctx);
-
        /* Set probability table buffer address */
        vdpu_write_relaxed(vpu, ctx->vp8_dec.prob_tbl.dma,
                           G1_REG_ADDR_QTABLE);
@@ -436,6 +433,7 @@ int hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)
 {
        const struct v4l2_ctrl_vp8_frame *hdr;
        struct hantro_dev *vpu = ctx->dev;
+       struct vb2_v4l2_buffer *vb2_dst;
        size_t height = ctx->dst_fmt.height;
        size_t width = ctx->dst_fmt.width;
        u32 mb_width, mb_height;
@@ -499,8 +497,10 @@ int hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)
        cfg_qp(ctx, hdr);
        cfg_parts(ctx, hdr);
        cfg_tap(ctx, hdr);
-       cfg_ref(ctx, hdr);
-       cfg_buffers(ctx, hdr);
+
+       vb2_dst = hantro_get_dst_buf(ctx);
+       cfg_ref(ctx, hdr, vb2_dst);
+       cfg_buffers(ctx, hdr, vb2_dst);
 
        hantro_end_prepare_run(ctx);
 

diff --git a/drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c b/drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c
index 7046075..d079075 100644 (file)
--- a/drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c
+++ b/drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c
@@ -444,14 +444,12 @@ static void cfg_tap(struct hantro_ctx *ctx,
 }
 
 static void cfg_ref(struct hantro_ctx *ctx,
-                   const struct v4l2_ctrl_vp8_frame *hdr)
+                   const struct v4l2_ctrl_vp8_frame *hdr,
+                   struct vb2_v4l2_buffer *vb2_dst)
 {
        struct hantro_dev *vpu = ctx->dev;
-       struct vb2_v4l2_buffer *vb2_dst;
        dma_addr_t ref;
 
-       vb2_dst = hantro_get_dst_buf(ctx);
-
        ref = hantro_get_ref(ctx, hdr->last_frame_ts);
        if (!ref) {
                vpu_debug(0, "failed to find last frame ts=%llu\n",
@@ -482,16 +480,14 @@ static void cfg_ref(struct hantro_ctx *ctx,
 }
 
 static void cfg_buffers(struct hantro_ctx *ctx,
-                       const struct v4l2_ctrl_vp8_frame *hdr)
+                       const struct v4l2_ctrl_vp8_frame *hdr,
+                       struct vb2_v4l2_buffer *vb2_dst)
 {
        const struct v4l2_vp8_segment *seg = &hdr->segment;
        struct hantro_dev *vpu = ctx->dev;
-       struct vb2_v4l2_buffer *vb2_dst;
        dma_addr_t dst_dma;
        u32 reg;
 
-       vb2_dst = hantro_get_dst_buf(ctx);
-
        /* Set probability table buffer address */
        vdpu_write_relaxed(vpu, ctx->vp8_dec.prob_tbl.dma,
                           VDPU_REG_ADDR_QTABLE);
@@ -514,6 +510,7 @@ int rockchip_vpu2_vp8_dec_run(struct hantro_ctx *ctx)
 {
        const struct v4l2_ctrl_vp8_frame *hdr;
        struct hantro_dev *vpu = ctx->dev;
+       struct vb2_v4l2_buffer *vb2_dst;
        size_t height = ctx->dst_fmt.height;
        size_t width = ctx->dst_fmt.width;
        u32 mb_width, mb_height;
@@ -590,8 +587,10 @@ int rockchip_vpu2_vp8_dec_run(struct hantro_ctx *ctx)
        cfg_qp(ctx, hdr);
        cfg_parts(ctx, hdr);
        cfg_tap(ctx, hdr);
-       cfg_ref(ctx, hdr);
-       cfg_buffers(ctx, hdr);
+
+       vb2_dst = hantro_get_dst_buf(ctx);
+       cfg_ref(ctx, hdr, vb2_dst);
+       cfg_buffers(ctx, hdr, vb2_dst);
 
        hantro_end_prepare_run(ctx);