summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@collabora.com>2019-07-25 10:17:53 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-07-25 12:09:01 -0400
commitdeff5c37c88921e61a336f1c4eba1f7ad438cebe (patch)
tree480239e4f6d8ac2bfd741f34bd0c32ab6b3c13a9 /drivers/staging/media/hantro/hantro_g1_vp8_dec.c
parent61e95d81aa28f411ff1238f56702dc2add2fac00 (diff)
downloadlinux-stable-deff5c37c88921e61a336f1c4eba1f7ad438cebe.tar.gz
linux-stable-deff5c37c88921e61a336f1c4eba1f7ad438cebe.tar.bz2
linux-stable-deff5c37c88921e61a336f1c4eba1f7ad438cebe.zip
media: hantro: Add hantro_get_{src, dst}_buf() helpers
And replace all calls to v4l2_m2m_next_{src,dst}_buf() by hantro_get_{src,dst}_buf() one. Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging/media/hantro/hantro_g1_vp8_dec.c')
-rw-r--r--drivers/staging/media/hantro/hantro_g1_vp8_dec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
index 72d983a11ca1..6032cbbecb06 100644
--- a/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
+++ b/drivers/staging/media/hantro/hantro_g1_vp8_dec.c
@@ -260,7 +260,7 @@ static void cfg_parts(struct hantro_ctx *ctx,
u32 count = 0;
unsigned int i;
- vb2_src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ vb2_src = hantro_get_src_buf(ctx);
src_dma = vb2_dma_contig_plane_dma_addr(&vb2_src->vb2_buf, 0);
/*
@@ -391,7 +391,7 @@ static void cfg_ref(struct hantro_ctx *ctx,
struct vb2_v4l2_buffer *vb2_dst;
dma_addr_t ref;
- vb2_dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+ vb2_dst = hantro_get_dst_buf(ctx);
ref = hantro_get_ref(cap_q, hdr->last_frame_ts);
if (!ref)
@@ -424,7 +424,7 @@ static void cfg_buffers(struct hantro_ctx *ctx,
dma_addr_t dst_dma;
u32 reg;
- vb2_dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+ vb2_dst = hantro_get_dst_buf(ctx);
/* Set probability table buffer address */
vdpu_write_relaxed(vpu, ctx->vp8_dec.prob_tbl.dma,
@@ -453,7 +453,7 @@ void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx)
u32 mb_width, mb_height;
u32 reg;
- vb2_src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+ vb2_src = hantro_get_src_buf(ctx);
v4l2_ctrl_request_setup(vb2_src->vb2_buf.req_obj.req,
&ctx->ctrl_handler);