Commit baf98b0a authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Mauro Carvalho Chehab
Browse files

media: mtk-vcodec: use v4l2_m2m_buffer where appropriate 



Despite using M2M in both the decoder and encoder, this driver used
vb2_v4l2_buffer as its base buffer structure, and placed a list_head
right after the buffer declaration in order to match the layout of a
v4l2_m2m_buffer. This is very dangerous as it means the driver will
break should the layout of v4l2_m2m_buffer change.

Fix this by directly using v4l2_m2m_buffer and updating the sites that
accessed the buffer accordingly.

Signed-off-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: fix checkpatch warning]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent b0e4cfae

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c

+36 −30
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static struct vb2_buffer *get_display_buffer(struct mtk_vcodec_ctx *ctx) 
{

	struct vdec_fb *disp_frame_buffer = NULL;

	struct mtk_video_dec_buf *dstbuf;

	struct vb2_v4l2_buffer *vb;



	mtk_v4l2_debug(3, "[%d]", ctx->id);

	if (vdec_if_get_param(ctx,
@@ -121,25 +122,26 @@ static struct vb2_buffer *get_display_buffer(struct mtk_vcodec_ctx *ctx) 


	dstbuf = container_of(disp_frame_buffer, struct mtk_video_dec_buf,

				frame_buffer);

	vb = &dstbuf->m2m_buf.vb;

	mutex_lock(&ctx->lock);

	if (dstbuf->used) {

		vb2_set_plane_payload(&dstbuf->vb.vb2_buf, 0,

		vb2_set_plane_payload(&vb->vb2_buf, 0,

				      ctx->picinfo.fb_sz[0]);

		if (ctx->q_data[MTK_Q_DATA_DST].fmt->num_planes == 2)

			vb2_set_plane_payload(&dstbuf->vb.vb2_buf, 1,

			vb2_set_plane_payload(&vb->vb2_buf, 1,

					      ctx->picinfo.fb_sz[1]);



		mtk_v4l2_debug(2,

				"[%d]status=%x queue id=%d to done_list %d",

				ctx->id, disp_frame_buffer->status,

				dstbuf->vb.vb2_buf.index,

				vb->vb2_buf.index,

				dstbuf->queued_in_vb2);



		v4l2_m2m_buf_done(&dstbuf->vb, VB2_BUF_STATE_DONE);

		v4l2_m2m_buf_done(vb, VB2_BUF_STATE_DONE);

		ctx->decoded_frame_cnt++;

	}

	mutex_unlock(&ctx->lock);

	return &dstbuf->vb.vb2_buf;

	return &vb->vb2_buf;

}



/*
@@ -154,6 +156,7 @@ static struct vb2_buffer *get_free_buffer(struct mtk_vcodec_ctx *ctx) 
{

	struct mtk_video_dec_buf *dstbuf;

	struct vdec_fb *free_frame_buffer = NULL;

	struct vb2_v4l2_buffer *vb;



	if (vdec_if_get_param(ctx,

				GET_PARAM_FREE_FRAME_BUFFER,
@@ -171,6 +174,7 @@ static struct vb2_buffer *get_free_buffer(struct mtk_vcodec_ctx *ctx) 


	dstbuf = container_of(free_frame_buffer, struct mtk_video_dec_buf,

				frame_buffer);

	vb = &dstbuf->m2m_buf.vb;



	mutex_lock(&ctx->lock);

	if (dstbuf->used) {
@@ -187,9 +191,9 @@ static struct vb2_buffer *get_free_buffer(struct mtk_vcodec_ctx *ctx) 
			mtk_v4l2_debug(2,

				"[%d]status=%x queue id=%d to rdy_queue %d",

				ctx->id, free_frame_buffer->status,

				dstbuf->vb.vb2_buf.index,

				vb->vb2_buf.index,

				dstbuf->queued_in_vb2);

			v4l2_m2m_buf_queue(ctx->m2m_ctx, &dstbuf->vb);

			v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);

		} else if ((dstbuf->queued_in_vb2 == false) &&

			   (dstbuf->queued_in_v4l2 == true)) {

			/*
@@ -205,8 +209,8 @@ static struct vb2_buffer *get_free_buffer(struct mtk_vcodec_ctx *ctx) 
			mtk_v4l2_debug(2,

					"[%d]status=%x queue id=%d to rdy_queue",

					ctx->id, free_frame_buffer->status,

					dstbuf->vb.vb2_buf.index);

			v4l2_m2m_buf_queue(ctx->m2m_ctx, &dstbuf->vb);

					vb->vb2_buf.index);

			v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);

			dstbuf->queued_in_vb2 = true;

		} else {

			/*
@@ -219,14 +223,14 @@ static struct vb2_buffer *get_free_buffer(struct mtk_vcodec_ctx *ctx) 
			 */

			mtk_v4l2_debug(3, "[%d]status=%x err queue id=%d %d %d",

					ctx->id, free_frame_buffer->status,

					dstbuf->vb.vb2_buf.index,

					vb->vb2_buf.index,

					dstbuf->queued_in_vb2,

					dstbuf->queued_in_v4l2);

		}

		dstbuf->used = false;

	}

	mutex_unlock(&ctx->lock);

	return &dstbuf->vb.vb2_buf;

	return &vb->vb2_buf;

}



static void clean_display_buffer(struct mtk_vcodec_ctx *ctx)
@@ -365,8 +369,10 @@ static void mtk_vdec_worker(struct work_struct *work) 
		return;

	}



	src_buf_info = container_of(src_buf, struct mtk_video_dec_buf, vb);

	dst_buf_info = container_of(dst_buf, struct mtk_video_dec_buf, vb);

	src_buf_info = container_of(src_buf, struct mtk_video_dec_buf,

				    m2m_buf.vb);

	dst_buf_info = container_of(dst_buf, struct mtk_video_dec_buf,

				    m2m_buf.vb);



	pfb = &dst_buf_info->frame_buffer;

	pfb->base_y.va = vb2_plane_vaddr(&dst_buf->vb2_buf, 0);
@@ -397,11 +403,11 @@ static void mtk_vdec_worker(struct work_struct *work) 


		vdec_if_decode(ctx, NULL, NULL, &res_chg);

		clean_display_buffer(ctx);

		vb2_set_plane_payload(&dst_buf_info->vb.vb2_buf, 0, 0);

		vb2_set_plane_payload(&dst_buf->vb2_buf, 0, 0);

		if (ctx->q_data[MTK_Q_DATA_DST].fmt->num_planes == 2)

			vb2_set_plane_payload(&dst_buf_info->vb.vb2_buf, 1, 0);

			vb2_set_plane_payload(&dst_buf->vb2_buf, 1, 0);

		dst_buf->flags |= V4L2_BUF_FLAG_LAST;

		v4l2_m2m_buf_done(&dst_buf_info->vb, VB2_BUF_STATE_DONE);

		v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);

		clean_free_buffer(ctx);

		v4l2_m2m_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx);

		return;
@@ -417,10 +423,8 @@ static void mtk_vdec_worker(struct work_struct *work) 
	}

	mtk_v4l2_debug(3, "[%d] Bitstream VA=%p DMA=%pad Size=%zx vb=%p",

			ctx->id, buf.va, &buf.dma_addr, buf.size, src_buf);

	dst_buf_info->vb.vb2_buf.timestamp

			= src_buf_info->vb.vb2_buf.timestamp;

	dst_buf_info->vb.timecode

			= src_buf_info->vb.timecode;

	dst_buf->vb2_buf.timestamp = src_buf->vb2_buf.timestamp;

	dst_buf->timecode = src_buf->timecode;

	mutex_lock(&ctx->lock);

	dst_buf_info->used = true;

	mutex_unlock(&ctx->lock);
@@ -434,7 +438,7 @@ static void mtk_vdec_worker(struct work_struct *work) 
			ctx->id,

			src_buf->vb2_buf.index,

			buf.size,

			src_buf_info->vb.vb2_buf.timestamp,

			src_buf->vb2_buf.timestamp,

			dst_buf->vb2_buf.index,

			ret, res_chg);

		src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
@@ -443,14 +447,14 @@ static void mtk_vdec_worker(struct work_struct *work) 
			src_buf_info->error = true;

			mutex_unlock(&ctx->lock);

		}

		v4l2_m2m_buf_done(&src_buf_info->vb, VB2_BUF_STATE_ERROR);

		v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);

	} else if (res_chg == false) {

		/*

		 * we only return src buffer with VB2_BUF_STATE_DONE

		 * when decode success without resolution change

		 */

		src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);

		v4l2_m2m_buf_done(&src_buf_info->vb, VB2_BUF_STATE_DONE);

		v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);

	}



	dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
@@ -522,7 +526,8 @@ static int vidioc_decoder_cmd(struct file *file, void *priv, 
			mtk_v4l2_debug(1, "Capture stream is off. No need to flush.");

			return 0;

		}

		v4l2_m2m_buf_queue(ctx->m2m_ctx, &ctx->empty_flush_buf->vb);

		v4l2_m2m_buf_queue(ctx->m2m_ctx,

				   &ctx->empty_flush_buf->m2m_buf.vb);

		v4l2_m2m_try_schedule(ctx->m2m_ctx);

		break;
@@ -1148,7 +1153,8 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb) 
	 */

	if (vb->vb2_queue->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {

		vb2_v4l2 = to_vb2_v4l2_buffer(vb);

		buf = container_of(vb2_v4l2, struct mtk_video_dec_buf, vb);

		buf = container_of(vb2_v4l2, struct mtk_video_dec_buf,

				   m2m_buf.vb);

		mutex_lock(&ctx->lock);

		if (buf->used == false) {

			v4l2_m2m_buf_queue(ctx->m2m_ctx, vb2_v4l2);
@@ -1175,7 +1181,7 @@ static void vb2ops_vdec_buf_queue(struct vb2_buffer *vb) 
		mtk_v4l2_err("No src buffer");

		return;

	}

	buf = container_of(src_buf, struct mtk_video_dec_buf, vb);

	buf = container_of(src_buf, struct mtk_video_dec_buf, m2m_buf.vb);

	if (buf->lastframe) {

		/* This shouldn't happen. Just in case. */

		mtk_v4l2_err("Invalid flush buffer.");
@@ -1256,7 +1262,7 @@ static void vb2ops_vdec_buf_finish(struct vb2_buffer *vb) 
	bool buf_error;



	vb2_v4l2 = container_of(vb, struct vb2_v4l2_buffer, vb2_buf);

	buf = container_of(vb2_v4l2, struct mtk_video_dec_buf, vb);

	buf = container_of(vb2_v4l2, struct mtk_video_dec_buf, m2m_buf.vb);

	mutex_lock(&ctx->lock);

	if (vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

		buf->queued_in_v4l2 = false;
@@ -1276,7 +1282,7 @@ static int vb2ops_vdec_buf_init(struct vb2_buffer *vb) 
	struct vb2_v4l2_buffer *vb2_v4l2 = container_of(vb,

					struct vb2_v4l2_buffer, vb2_buf);

	struct mtk_video_dec_buf *buf = container_of(vb2_v4l2,

					struct mtk_video_dec_buf, vb);

					struct mtk_video_dec_buf, m2m_buf.vb);



	if (vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {

		buf->used = false;
@@ -1309,7 +1315,7 @@ static void vb2ops_vdec_stop_streaming(struct vb2_queue *q) 
	if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {

		while ((src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx))) {

			struct mtk_video_dec_buf *buf_info = container_of(

					src_buf, struct mtk_video_dec_buf, vb);

				 src_buf, struct mtk_video_dec_buf, m2m_buf.vb);

			if (!buf_info->lastframe)

				v4l2_m2m_buf_done(src_buf,

						VB2_BUF_STATE_ERROR);

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h

+3 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define _MTK_VCODEC_DEC_H_



#include <media/videobuf2-core.h>

#include <media/videobuf2-v4l2.h>

#include <media/v4l2-mem2mem.h>



#define VCODEC_CAPABILITY_4K_DISABLED	0x10

#define VCODEC_DEC_4K_CODED_WIDTH	4096U
@@ -33,7 +33,7 @@ struct vdec_fb { 


/**

 * struct mtk_video_dec_buf - Private data related to each VB2 buffer.

 * @b:		VB2 buffer

 * @m2m_buf:	M2M buffer

 * @list:	link list

 * @used:	Capture buffer contain decoded frame data and keep in

 *			codec data structure
@@ -47,8 +47,7 @@ struct vdec_fb { 
 * Note : These status information help us track and debug buffer state

 */

struct mtk_video_dec_buf {

	struct vb2_v4l2_buffer	vb;

	struct list_head	list;

	struct v4l2_m2m_buffer	m2m_buf;



	bool	used;

	bool	queued_in_vb2;

drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int fops_vcodec_open(struct file *file) 
	}

	src_vq = v4l2_m2m_get_vq(ctx->m2m_ctx,

				V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);

	ctx->empty_flush_buf->vb.vb2_buf.vb2_queue = src_vq;

	ctx->empty_flush_buf->m2m_buf.vb.vb2_buf.vb2_queue = src_vq;

	ctx->empty_flush_buf->lastframe = true;

	mtk_vcodec_dec_set_default_params(ctx);

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c

+8 −6
Original line number Diff line number Diff line
@@ -795,13 +795,14 @@ static void vb2ops_venc_buf_queue(struct vb2_buffer *vb) 
			container_of(vb, struct vb2_v4l2_buffer, vb2_buf);



	struct mtk_video_enc_buf *mtk_buf =

			container_of(vb2_v4l2, struct mtk_video_enc_buf, vb);

			container_of(vb2_v4l2, struct mtk_video_enc_buf,

				     m2m_buf.vb);



	if ((vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) &&

	    (ctx->param_change != MTK_ENCODE_PARAM_NONE)) {

		mtk_v4l2_debug(1, "[%d] Before id=%d encode parameter change %x",

			       ctx->id,

			       mtk_buf->vb.vb2_buf.index,

			       vb2_v4l2->vb2_buf.index,

			       ctx->param_change);

		mtk_buf->param_change = ctx->param_change;

		mtk_buf->enc_params = ctx->enc_params;
@@ -983,7 +984,8 @@ static int mtk_venc_param_change(struct mtk_vcodec_ctx *ctx) 
	struct venc_enc_param enc_prm;

	struct vb2_v4l2_buffer *vb2_v4l2 = v4l2_m2m_next_src_buf(ctx->m2m_ctx);

	struct mtk_video_enc_buf *mtk_buf =

			container_of(vb2_v4l2, struct mtk_video_enc_buf, vb);

			container_of(vb2_v4l2, struct mtk_video_enc_buf,

				     m2m_buf.vb);



	int ret = 0;
@@ -995,7 +997,7 @@ static int mtk_venc_param_change(struct mtk_vcodec_ctx *ctx) 
		enc_prm.bitrate = mtk_buf->enc_params.bitrate;

		mtk_v4l2_debug(1, "[%d] id=%d, change param br=%d",

				ctx->id,

				mtk_buf->vb.vb2_buf.index,

				vb2_v4l2->vb2_buf.index,

				enc_prm.bitrate);

		ret |= venc_if_set_param(ctx,

					 VENC_SET_PARAM_ADJUST_BITRATE,
@@ -1006,7 +1008,7 @@ static int mtk_venc_param_change(struct mtk_vcodec_ctx *ctx) 
				   mtk_buf->enc_params.framerate_denom;

		mtk_v4l2_debug(1, "[%d] id=%d, change param fr=%d",

			       ctx->id,

			       mtk_buf->vb.vb2_buf.index,

			       vb2_v4l2->vb2_buf.index,

			       enc_prm.frm_rate);

		ret |= venc_if_set_param(ctx,

					 VENC_SET_PARAM_ADJUST_FRAMERATE,
@@ -1023,7 +1025,7 @@ static int mtk_venc_param_change(struct mtk_vcodec_ctx *ctx) 
	if (!ret && mtk_buf->param_change & MTK_ENCODE_PARAM_FORCE_INTRA) {

		mtk_v4l2_debug(1, "[%d] id=%d, change param force I=%d",

				ctx->id,

				mtk_buf->vb.vb2_buf.index,

				vb2_v4l2->vb2_buf.index,

				mtk_buf->enc_params.force_intra);

		if (mtk_buf->enc_params.force_intra)

			ret |= venc_if_set_param(ctx,

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h

+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define _MTK_VCODEC_ENC_H_



#include <media/videobuf2-core.h>

#include <media/videobuf2-v4l2.h>

#include <media/v4l2-mem2mem.h>



#define MTK_VENC_IRQ_STATUS_SPS	0x1

#define MTK_VENC_IRQ_STATUS_PPS	0x2
@@ -23,15 +23,15 @@ 


/**

 * struct mtk_video_enc_buf - Private data related to each VB2 buffer.

 * @vb: Pointer to related VB2 buffer.

 * @m2m_buf:	M2M buffer

 * @list:	list that buffer link to

 * @param_change: Types of encode parameter change before encoding this

 *				buffer

 * @enc_params: Encode parameters changed before encode this buffer

 */

struct mtk_video_enc_buf {

	struct vb2_v4l2_buffer vb;

	struct list_head list;

	struct v4l2_m2m_buffer m2m_buf;



	u32 param_change;

	struct mtk_enc_params enc_params;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE