Commit f71193af authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: hantro: Simplify buffer helpers 



Modify hantro_get_ref() and hantro_h264_get_ref_buf() helpers
to return the buffer DMA address, this makes the code simpler
and at the same time will allow easier enablement of the
post-processing feature.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 05e58c83

drivers/staging/media/hantro/hantro.h

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static inline void hantro_reg_write(struct hantro_dev *vpu, 
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);

dma_addr_t hantro_get_ref(struct hantro_ctx *ctx, u64 ts);



static inline struct vb2_v4l2_buffer *

hantro_get_src_buf(struct hantro_ctx *ctx)

drivers/staging/media/hantro/hantro_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -43,8 +43,9 @@ void *hantro_get_ctrl(struct hantro_ctx *ctx, u32 id) 
	return ctrl ? ctrl->p_cur.p : NULL;

}



dma_addr_t hantro_get_ref(struct vb2_queue *q, u64 ts)

dma_addr_t hantro_get_ref(struct hantro_ctx *ctx, u64 ts)

{

	struct vb2_queue *q = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx);

	struct vb2_buffer *buf;

	int index;

drivers/staging/media/hantro/hantro_g1_h264_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -220,10 +220,9 @@ static void set_ref(struct hantro_ctx *ctx) 


	/* Set up addresses of DPB buffers. */

	for (i = 0; i < HANTRO_H264_DPB_SIZE; i++) {

		struct vb2_buffer *buf =  hantro_h264_get_ref_buf(ctx, i);

		dma_addr_t dma_addr = hantro_h264_get_ref_buf(ctx, i);



		vdpu_write_relaxed(vpu, vb2_dma_contig_plane_dma_addr(buf, 0),

				   G1_REG_ADDR_REF(i));

		vdpu_write_relaxed(vpu, dma_addr, G1_REG_ADDR_REF(i));

	}

}

drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c

+2 −5
Original line number Diff line number Diff line
@@ -105,17 +105,14 @@ hantro_g1_mpeg2_dec_set_buffers(struct hantro_dev *vpu, struct hantro_ctx *ctx, 
{

	dma_addr_t forward_addr = 0, backward_addr = 0;

	dma_addr_t current_addr, addr;

	struct vb2_queue *vq;



	vq = v4l2_m2m_get_dst_vq(ctx->fh.m2m_ctx);



	switch (picture->picture_coding_type) {

	case V4L2_MPEG2_PICTURE_CODING_TYPE_B:

		backward_addr = hantro_get_ref(vq,

		backward_addr = hantro_get_ref(ctx,

					       slice_params->backward_ref_ts);

		/* fall-through */

	case V4L2_MPEG2_PICTURE_CODING_TYPE_P:

		forward_addr = hantro_get_ref(vq,

		forward_addr = hantro_get_ref(ctx,

					      slice_params->forward_ref_ts);

	}

drivers/staging/media/hantro/hantro_g1_vp8_dec.c

+3 −4
Original line number Diff line number Diff line
@@ -370,19 +370,18 @@ static void cfg_tap(struct hantro_ctx *ctx, 
static void cfg_ref(struct hantro_ctx *ctx,

		    const struct v4l2_ctrl_vp8_frame_header *hdr)

{

	struct vb2_queue *cap_q = &ctx->fh.m2m_ctx->cap_q_ctx.q;

	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(cap_q, hdr->last_frame_ts);

	ref = hantro_get_ref(ctx, hdr->last_frame_ts);

	if (!ref)

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);

	vdpu_write_relaxed(vpu, ref, G1_REG_ADDR_REF(0));



	ref = hantro_get_ref(cap_q, hdr->golden_frame_ts);

	ref = hantro_get_ref(ctx, hdr->golden_frame_ts);

	WARN_ON(!ref && hdr->golden_frame_ts);

	if (!ref)

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);
@@ -390,7 +389,7 @@ static void cfg_ref(struct hantro_ctx *ctx, 
		ref |= G1_REG_ADDR_REF_TOPC_E;

	vdpu_write_relaxed(vpu, ref, G1_REG_ADDR_REF(4));



	ref = hantro_get_ref(cap_q, hdr->alt_frame_ts);

	ref = hantro_get_ref(ctx, hdr->alt_frame_ts);

	WARN_ON(!ref && hdr->alt_frame_ts);

	if (!ref)

		ref = vb2_dma_contig_plane_dma_addr(&vb2_dst->vb2_buf, 0);