Received-SPF: pass (google.com: domain of linux-kernel+bounces-23295-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <95daea30-14e6-4c0b-8a0c-60641efc9d92@collabora.com>
Date: Thu, 11 Jan 2024 10:15:20 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] media: mediatek: vcodec: setting request complete before
 buffer done
To: Yunfei Dong <yunfei.dong@mediatek.com>,
 =?UTF-8?Q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= <nfraprado@collabora.com>,
 Nicolas Dufresne <nicolas.dufresne@collabora.com>,
 Hans Verkuil <hverkuil-cisco@xs4all.nl>,
 AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
 Nathan Hebert <nhebert@chromium.org>
Cc: Hsin-Yi Wang <hsinyi@chromium.org>, Fritz Koenig <frkoenig@chromium.org>,
 Daniel Vetter <daniel@ffwll.ch>, Steve Cho <stevecho@chromium.org>,
 linux-media@vger.kernel.org, devicetree@vger.kernel.org,
 linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
 linux-mediatek@lists.infradead.org,
 Project_Global_Chrome_Upstream_Group@mediatek.com
References: <20240111071713.16331-1-yunfei.dong@mediatek.com>
Content-Language: en-US
From: Benjamin Gaignard <benjamin.gaignard@collabora.com>
In-Reply-To: <20240111071713.16331-1-yunfei.dong@mediatek.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit


Le 11/01/2024 à 08:17, Yunfei Dong a écrit :
> The request status of output queue will be set to MEDIA_REQUEST_STATE_COMPLETE
> when user space dequeue output buffer. Then calling v4l2_ctrl_request_complete
> will get below warning, need to call v4l2_ctrl_request_complete before
> v4l2_m2m_buf_done.
> Workqueue: core-decoder vdec_msg_queue_core_work [mtk_vcodec_dec]
> pstate: 80c00089 (Nzcv daIf +PAN +UAO -TCO BTYPE=--)
> pc : media_request_object_bind+0xa8/0x124
> lr : media_request_object_bind+0x50/0x124
> sp : ffffffc011393be0
> x29: ffffffc011393be0 x28: 0000000000000000
> x27: ffffff890c280248 x26: ffffffe21a71ab88
> x25: 0000000000000000 x24: ffffff890c280280
> x23: ffffff890c280280 x22: 00000000fffffff0
> x21: 0000000000000000 x20: ffffff890260d280
> x19: ffffff890260d2e8 x18: 0000000000001000
> x17: 0000000000000400 x16: ffffffe21a4584a0
> x15: 000000000053361d x14: 0000000000000018
> x13: 0000000000000004 x12: ffffffa82427d000
> x11: ffffffe21ac3fce0 x10: 0000000000000001
> x9 : 0000000000000000 x8 : 0000000000000003
> x7 : 0000000000000000 x6 : 000000000000003f
> x5 : 0000000000000040 x4 : ffffff89052e7b98
> x3 : 0000000000000000 x2 : 0000000000000001
> x1 : 0000000000000000 x0 : 0000000000000000
> Call trace:
>   media_request_object_bind+0xa8/0x124
>   v4l2_ctrl_request_bind+0xc4/0x168
>   v4l2_ctrl_request_complete+0x198/0x1f4
>   mtk_vdec_stateless_cap_to_disp+0x58/0x8c [mtk_vcodec_dec 245a7c1e48ff1b2451a50e1dfcb174262b6b462c]
>   vdec_vp9_slice_core_decode+0x1c0/0x268 [mtk_vcodec_dec 245a7c1e48ff1b2451a50e1dfcb174262b6b462c]
>   vdec_msg_queue_core_work+0x60/0x11c [mtk_vcodec_dec 245a7c1e48ff1b2451a50e1dfcb174262b6b462c]
>   process_one_work+0x140/0x480
>   worker_thread+0x12c/0x2f8
>   kthread+0x13c/0x1d8
>   ret_from_fork+0x10/0x30
>
> 'Fixes: 7b182b8d9c852 ("media: mediatek: vcodec: Refactor get and put capture buffer flow")'
> Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>

Reviewed-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>

> ---
>   .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h     |  3 ++-
>   .../vcodec/decoder/mtk_vcodec_dec_stateless.c        | 12 +++++++-----
>   .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c        |  7 +++++--
>   .../vcodec/decoder/vdec/vdec_h264_req_multi_if.c     |  3 ++-
>   .../vcodec/decoder/vdec/vdec_hevc_req_multi_if.c     |  3 ++-
>   .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c        |  6 ++++--
>   .../mediatek/vcodec/decoder/vdec_msg_queue.h         |  2 ++
>   7 files changed, 24 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h
> index 849b89dd205c..3f5b625330bc 100644
> --- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h
> +++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h
> @@ -111,7 +111,8 @@ struct mtk_vcodec_dec_pdata {
>   	int (*flush_decoder)(struct mtk_vcodec_dec_ctx *ctx);
>   	struct vdec_fb *(*get_cap_buffer)(struct mtk_vcodec_dec_ctx *ctx);
>   	void (*cap_to_disp)(struct mtk_vcodec_dec_ctx *ctx, int error,
> -			    struct media_request *src_buf_req);
> +			    struct media_request *src_buf_req,
> +			    struct vb2_v4l2_buffer *vb2_v4l2_src);
>   
>   	const struct vb2_ops *vdec_vb2_ops;
>   
> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c
> index d54b3833790d..2efa34b6750b 100644
> --- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c
> +++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c
> @@ -245,7 +245,8 @@ static const struct v4l2_frmsize_stepwise stepwise_fhd = {
>   };
>   
>   static void mtk_vdec_stateless_cap_to_disp(struct mtk_vcodec_dec_ctx *ctx, int error,
> -					   struct media_request *src_buf_req)
> +					   struct media_request *src_buf_req,
> +					   struct vb2_v4l2_buffer *vb2_v4l2_src)
>   {
>   	struct vb2_v4l2_buffer *vb2_dst;
>   	enum vb2_buffer_state state;
> @@ -266,6 +267,9 @@ static void mtk_vdec_stateless_cap_to_disp(struct mtk_vcodec_dec_ctx *ctx, int e
>   
>   	if (src_buf_req)
>   		v4l2_ctrl_request_complete(src_buf_req, &ctx->ctrl_hdl);
> +
> +	if (vb2_v4l2_src)
> +		v4l2_m2m_buf_done(vb2_v4l2_src, state);
>   }
>   
>   static struct vdec_fb *vdec_get_cap_buffer(struct mtk_vcodec_dec_ctx *ctx)
> @@ -374,14 +378,12 @@ static void mtk_vdec_worker(struct work_struct *work)
>   	state = ret ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE;
>   	if (!IS_VDEC_LAT_ARCH(dev->vdec_pdata->hw_arch) ||
>   	    ctx->current_codec == V4L2_PIX_FMT_VP8_FRAME) {
> -		v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx, state);
>   		if (src_buf_req)
>   			v4l2_ctrl_request_complete(src_buf_req, &ctx->ctrl_hdl);
> +		v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx, state);
>   	} else {
> -		if (ret != -EAGAIN) {
> +		if (ret != -EAGAIN)
>   			v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
> -			v4l2_m2m_buf_done(vb2_v4l2_src, state);
> -		}
>   		v4l2_m2m_job_finish(dev->m2m_dev_dec, ctx->m2m_ctx);
>   	}
>   }
> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c
> index 2b6a5adbc419..f277b907c345 100644
> --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c
> +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c
> @@ -1064,6 +1064,8 @@ static int vdec_av1_slice_setup_lat_from_src_buf(struct vdec_av1_slice_instance
>   		return -EINVAL;
>   
>   	lat_buf->src_buf_req = src->vb2_buf.req_obj.req;
> +	lat_buf->vb2_v4l2_src = src;
> +
>   	dst = &lat_buf->ts_info;
>   	v4l2_m2m_buf_copy_metadata(src, dst, true);
>   	vsi->frame.cur_ts = dst->vb2_buf.timestamp;
> @@ -2187,7 +2189,7 @@ static int vdec_av1_slice_core_decode(struct vdec_lat_buf *lat_buf)
>   		       &instance->core_vsi->trans.dma_addr_end);
>   	vdec_msg_queue_update_ube_rptr(&ctx->msg_queue, instance->core_vsi->trans.dma_addr_end);
>   
> -	ctx->dev->vdec_pdata->cap_to_disp(ctx, 0, lat_buf->src_buf_req);
> +	ctx->dev->vdec_pdata->cap_to_disp(ctx, 0, lat_buf->src_buf_req, lat_buf->vb2_v4l2_src);
>   
>   	return 0;
>   
> @@ -2196,7 +2198,8 @@ static int vdec_av1_slice_core_decode(struct vdec_lat_buf *lat_buf)
>   	vdec_msg_queue_update_ube_rptr(&ctx->msg_queue, pfc->vsi.trans.dma_addr_end);
>   
>   	if (fb)
> -		ctx->dev->vdec_pdata->cap_to_disp(ctx, 1, lat_buf->src_buf_req);
> +		ctx->dev->vdec_pdata->cap_to_disp(ctx, 1, lat_buf->src_buf_req,
> +						  lat_buf->vb2_v4l2_src);
>   
>   	return ret;
>   }
> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c
> index 0e741e0dc8ba..7033999018ca 100644
> --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c
> +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c
> @@ -533,7 +533,7 @@ static int vdec_h264_slice_core_decode(struct vdec_lat_buf *lat_buf)
>   
>   vdec_dec_end:
>   	vdec_msg_queue_update_ube_rptr(&lat_buf->ctx->msg_queue, share_info->trans_end);
> -	ctx->dev->vdec_pdata->cap_to_disp(ctx, !!err, lat_buf->src_buf_req);
> +	ctx->dev->vdec_pdata->cap_to_disp(ctx, !!err, lat_buf->src_buf_req, lat_buf->vb2_v4l2_src);
>   	mtk_vdec_debug(ctx, "core decode done err=%d", err);
>   	ctx->decoded_frame_cnt++;
>   	return 0;
> @@ -606,6 +606,7 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
>   
>   	inst->vsi->dec.nal_info = buf[nal_start_idx];
>   	lat_buf->src_buf_req = src_buf_info->m2m_buf.vb.vb2_buf.req_obj.req;
> +	lat_buf->vb2_v4l2_src = &src_buf_info->m2m_buf.vb;
>   	v4l2_m2m_buf_copy_metadata(&src_buf_info->m2m_buf.vb, &lat_buf->ts_info, true);
>   
>   	err = vdec_h264_slice_fill_decode_parameters(inst, share_info);
> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c
> index 06ed47df693b..67fe3c4bfac3 100644
> --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c
> +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c
> @@ -742,6 +742,7 @@ static int vdec_hevc_slice_setup_lat_buffer(struct vdec_hevc_slice_inst *inst,
>   
>   	src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer);
>   	lat_buf->src_buf_req = src_buf_info->m2m_buf.vb.vb2_buf.req_obj.req;
> +	lat_buf->vb2_v4l2_src = &src_buf_info->m2m_buf.vb;
>   	v4l2_m2m_buf_copy_metadata(&src_buf_info->m2m_buf.vb, &lat_buf->ts_info, true);
>   
>   	*res_chg = inst->resolution_changed;
> @@ -961,7 +962,7 @@ static int vdec_hevc_slice_core_decode(struct vdec_lat_buf *lat_buf)
>   
>   vdec_dec_end:
>   	vdec_msg_queue_update_ube_rptr(&lat_buf->ctx->msg_queue, share_info->trans.dma_addr_end);
> -	ctx->dev->vdec_pdata->cap_to_disp(ctx, !!err, lat_buf->src_buf_req);
> +	ctx->dev->vdec_pdata->cap_to_disp(ctx, !!err, lat_buf->src_buf_req, lat_buf->vb2_v4l2_src);
>   	mtk_vdec_debug(ctx, "core decode done err=%d", err);
>   	ctx->decoded_frame_cnt++;
>   	return 0;
> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
> index 69d37b93bd35..a7734d032269 100644
> --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
> +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c
> @@ -723,6 +723,7 @@ static int vdec_vp9_slice_setup_lat_from_src_buf(struct vdec_vp9_slice_instance
>   		return -EINVAL;
>   
>   	lat_buf->src_buf_req = src->vb2_buf.req_obj.req;
> +	lat_buf->vb2_v4l2_src = src;
>   
>   	dst = &lat_buf->ts_info;
>   	v4l2_m2m_buf_copy_metadata(src, dst, true);
> @@ -2188,7 +2189,7 @@ static int vdec_vp9_slice_core_decode(struct vdec_lat_buf *lat_buf)
>   	mtk_vdec_debug(ctx, "core dma_addr_end 0x%lx\n",
>   		       (unsigned long)pfc->vsi.trans.dma_addr_end);
>   	vdec_msg_queue_update_ube_rptr(&ctx->msg_queue, pfc->vsi.trans.dma_addr_end);
> -	ctx->dev->vdec_pdata->cap_to_disp(ctx, 0, lat_buf->src_buf_req);
> +	ctx->dev->vdec_pdata->cap_to_disp(ctx, 0, lat_buf->src_buf_req, lat_buf->vb2_v4l2_src);
>   
>   	return 0;
>   
> @@ -2198,7 +2199,8 @@ static int vdec_vp9_slice_core_decode(struct vdec_lat_buf *lat_buf)
>   		vdec_msg_queue_update_ube_rptr(&ctx->msg_queue, pfc->vsi.trans.dma_addr_end);
>   
>   		if (fb)
> -			ctx->dev->vdec_pdata->cap_to_disp(ctx, 1, lat_buf->src_buf_req);
> +			ctx->dev->vdec_pdata->cap_to_disp(ctx, 1, lat_buf->src_buf_req,
> +							  lat_buf->vb2_v4l2_src);
>   	}
>   	return ret;
>   }
> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.h b/drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.h
> index 1d9beb9e4a14..b0f2443d186f 100644
> --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.h
> +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.h
> @@ -55,6 +55,7 @@ struct vdec_msg_queue_ctx {
>    * @rd_mv_addr:	mv addr for av1 lat hardware output, core hardware input
>    * @tile_addr:	tile buffer for av1 core input
>    * @ts_info: need to set timestamp from output to capture
> + * @vb2_v4l2_src: the vb2 buffer of output queue
>    * @src_buf_req: output buffer media request object
>    *
>    * @private_data: shared information used to lat and core hardware
> @@ -71,6 +72,7 @@ struct vdec_lat_buf {
>   	struct mtk_vcodec_mem rd_mv_addr;
>   	struct mtk_vcodec_mem tile_addr;
>   	struct vb2_v4l2_buffer ts_info;
> +	struct vb2_v4l2_buffer *vb2_v4l2_src;
>   	struct media_request *src_buf_req;
>   
>   	void *private_data;