Commit 0c6280b3 authored by Yunfei Dong's avatar Yunfei Dong Committed by Mauro Carvalho Chehab
Browse files

media: mtk-vcodec: support single-buffer frames 



MT8183 will use a multi-planar format backed by a single buffer. Adapt
the existing code to be able to handle such frames instead of assuming
each frame is backed by two buffers.

Co-developed-by: default avatarAlexandre Courbot <acourbot@chromium.org>
[acourbot: refactor, cleanup and split]

Signed-off-by: default avatarYunfei Dong <yunfei.dong@mediatek.com>
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 alignment warning]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 0a7ff71e

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

+7 −4
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static struct vb2_buffer *get_display_buffer(struct mtk_vcodec_ctx *ctx) 
	if (dstbuf->used) {

		vb2_set_plane_payload(&dstbuf->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,

					      ctx->picinfo.fb_sz[1]);
@@ -389,6 +390,7 @@ 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);

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

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

		dst_buf->flags |= V4L2_BUF_FLAG_LAST;

		v4l2_m2m_buf_done(&dst_buf_info->vb, VB2_BUF_STATE_DONE);
@@ -1320,6 +1322,7 @@ static void vb2ops_vdec_stop_streaming(struct vb2_queue *q) 


	while ((dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx))) {

		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->vb2_buf, 1, 0);

		v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);

	}