Commit deff5c37 authored by Boris Brezillon's avatar Boris Brezillon Committed by Mauro Carvalho Chehab
Browse files

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: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 61e95d81

drivers/staging/media/hantro/hantro.h

+13 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <media/v4l2-ctrls.h>

#include <media/v4l2-device.h>

#include <media/v4l2-ioctl.h>

#include <media/v4l2-mem2mem.h>

#include <media/videobuf2-core.h>

#include <media/videobuf2-dma-contig.h>
@@ -373,4 +374,16 @@ bool hantro_is_encoder_ctx(const struct hantro_ctx *ctx); 
void *hantro_get_ctrl(struct hantro_ctx *ctx, u32 id);

dma_addr_t hantro_get_ref(struct vb2_queue *q, u64 ts);



static inline struct vb2_v4l2_buffer *

hantro_get_src_buf(struct hantro_ctx *ctx)

{

	return v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);

}



static inline struct vb2_v4l2_buffer *

hantro_get_dst_buf(struct hantro_ctx *ctx)

{

	return v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

}



#endif /* HANTRO_H_ */

drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx) 
	const struct v4l2_mpeg2_picture *picture;

	u32 reg;



	src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

	src_buf = hantro_get_src_buf(ctx);

	dst_buf = hantro_get_dst_buf(ctx);



	/* Apply request controls if any */

	v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req,

drivers/staging/media/hantro/hantro_g1_vp8_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/staging/media/hantro/hantro_h1_jpeg_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ void hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx) 
	struct hantro_jpeg_ctx jpeg_ctx;

	u32 reg;



	src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

	src_buf = hantro_get_src_buf(ctx);

	dst_buf = hantro_get_dst_buf(ctx);



	memset(&jpeg_ctx, 0, sizeof(jpeg_ctx));

	jpeg_ctx.buffer = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);

drivers/staging/media/hantro/rk3399_vpu_hw_jpeg_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ void rk3399_vpu_jpeg_enc_run(struct hantro_ctx *ctx) 
	struct media_request *src_req;

	u32 reg;



	src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);

	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);

	src_buf = hantro_get_src_buf(ctx);

	dst_buf = hantro_get_dst_buf(ctx);



	src_req = src_buf->vb2_buf.req_obj.req;

	v4l2_ctrl_request_setup(src_req, &ctx->ctrl_handler);

CRA Git | Maintained and supported by SUSTech CRA and CCSE