[PATCH v6 1/5] media: mediatek: vcodec: setting request complete before buffer done
Chen-Yu Tsai
wenst at chromium.org
Fri Nov 8 00:50:50 PST 2024
On Fri, Nov 8, 2024 at 4:18 PM Sebastian Fricke
<sebastian.fricke at collabora.com> wrote:
>
> Hey Yunfei & Chen-Yu,
>
> On 08.11.2024 15:49, Chen-Yu Tsai wrote:
> >On Fri, Nov 8, 2024 at 11:32 AM Yunfei Dong <yunfei.dong at mediatek.com> wrote:
> >>
> >> The request status of output queue is set to MEDIA_REQUEST_STATE_COMPLETE
> >> when user space dequeue output buffer. Will get below warning if the
> >> driver calling v4l2_ctrl_request_complete to set media request complete,
> >> must to change the function order, calling 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 at mediatek.com>
> >
> >The changes look OK, so
> >
> >Reviewed-by: Chen-Yu Tsai <wenst at chromium.org>
>
> Sorry for the late reply, I am currently finishing up a change-set that
> utilizes https://patchwork.linuxtv.org/project/linux-media/list/?series=13489
> which is the prefered solution. I think there has been some
> misunderstanding when I last talked about that in a previous version.
> Using the manual request completion will be the cleaner solution because
> it allows sending new bitstream data as soon as the LAT core finishes
> the previous data, which doesn't decrease performance.
I don't think manual request completion is really needed.
The driver could be reworked so that when the VP8 / pure core / lat
decoder functions return, v4l2_ctrl_request_complete() is called
and the source buffer is removed and marked as done. It should
probably also remove a destination buffer and pass that to the
core decode worker, i.e. it should consume source and destination
buffers in pairs.
And IIUC the next job is scheduled when v4l2_m2m_job_finish() is called,
which is basically when the LAT core finishes.
> The plan would be for Yunfei to take that patch set of mine and rebase
> his changes on top.
Just to clarify, what changes will your patch set cover?
Thanks
ChenYu
> Regards,
> Sebastian
>
> >
> >> ---
> >> .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 4 ++--
> >> .../vcodec/decoder/mtk_vcodec_dec_drv.h | 2 +-
> >> .../vcodec/decoder/mtk_vcodec_dec_stateless.c | 17 ++++++++++++-----
> >> .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c | 7 ++++---
> >> .../decoder/vdec/vdec_h264_req_multi_if.c | 4 ++--
> >> .../decoder/vdec/vdec_hevc_req_multi_if.c | 4 ++--
> >> .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 6 +++---
> >> .../mediatek/vcodec/decoder/vdec_msg_queue.h | 4 ++--
> >> 8 files changed, 28 insertions(+), 20 deletions(-)
> >>
> >> diff --git a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
> >> index 98838217b97d..2b787e60a1f9 100644
> >> --- a/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
> >> +++ b/drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
> >> @@ -887,10 +887,10 @@ void vb2ops_vdec_stop_streaming(struct vb2_queue *q)
> >> if (src_buf != &ctx->empty_flush_buf.vb) {
> >> struct media_request *req =
> >> src_buf->vb2_buf.req_obj.req;
> >> - v4l2_m2m_buf_done(src_buf,
> >> - VB2_BUF_STATE_ERROR);
> >> +
> >> if (req)
> >> v4l2_ctrl_request_complete(req, &ctx->ctrl_hdl);
> >> + v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);
> >> }
> >> }
> >> return;
> >> 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 ac568ed14fa2..1fabe8c5b7a4 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,7 @@ 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 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 afa224da0f41..750f98c1226d 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,10 +245,11 @@ 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 vb2_v4l2_buffer *vb2_v4l2_src)
> >> {
> >> struct vb2_v4l2_buffer *vb2_dst;
> >> enum vb2_buffer_state state;
> >> + struct media_request *src_buf_req;
> >>
> >> if (error)
> >> state = VB2_BUF_STATE_ERROR;
> >> @@ -264,8 +265,16 @@ static void mtk_vdec_stateless_cap_to_disp(struct mtk_vcodec_dec_ctx *ctx, int e
> >> mtk_v4l2_vdec_err(ctx, "dst buffer is NULL");
> >> }
> >>
> >> + if (!vb2_v4l2_src) {
> >> + mtk_v4l2_vdec_err(ctx, "get src buffer NULL");
> >> + return;
> >> + }
> >> +
> >> + src_buf_req = vb2_v4l2_src->vb2_buf.req_obj.req;
> >> if (src_buf_req)
> >> v4l2_ctrl_request_complete(src_buf_req, &ctx->ctrl_hdl);
> >> +
> >> + v4l2_m2m_buf_done(vb2_v4l2_src, state);
> >> }
> >>
> >> static struct vdec_fb *vdec_get_cap_buffer(struct mtk_vcodec_dec_ctx *ctx)
> >> @@ -374,14 +383,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);
> >> }
> >
> >At some point I think we should unify the assumptions of the VP8,
> >pure single core and lat decode functions so that we don't have all
> >these different code paths.
> >
> >ChenYu
> >
> >
> >> }
> >> 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 bf21f2467a0f..90217cc8e242 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
> >> @@ -1071,7 +1071,8 @@ static int vdec_av1_slice_setup_lat_from_src_buf(struct vdec_av1_slice_instance
> >> if (!src)
> >> 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;
> >> @@ -2195,7 +2196,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->vb2_v4l2_src);
> >>
> >> return 0;
> >>
> >> @@ -2204,7 +2205,7 @@ 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->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 1ed0ccec5665..732d78f63e5a 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->vb2_v4l2_src);
> >> mtk_vdec_debug(ctx, "core decode done err=%d", err);
> >> ctx->decoded_frame_cnt++;
> >> return 0;
> >> @@ -605,7 +605,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 aa721cc43647..f6f9f7de0005 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
> >> @@ -741,7 +741,7 @@ static int vdec_hevc_slice_setup_lat_buffer(struct vdec_hevc_slice_inst *inst,
> >> inst->vsi->bs.size = bs->size;
> >>
> >> 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 +961,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->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 eea709d93820..3dceb668ba1c 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
> >> @@ -721,7 +721,7 @@ static int vdec_vp9_slice_setup_lat_from_src_buf(struct vdec_vp9_slice_instance
> >> if (!src)
> >> 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);
> >> @@ -2187,7 +2187,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->vb2_v4l2_src);
> >>
> >> return 0;
> >>
> >> @@ -2197,7 +2197,7 @@ 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->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 b0f576867f4b..9781de35df4b 100644
> >> --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.h
> >> +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.h
> >> @@ -55,7 +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
> >> - * @src_buf_req: output buffer media request object
> >> + * @vb2_v4l2_src: vb2 buffer of output queue
> >> *
> >> * @private_data: shared information used to lat and core hardware
> >> * @ctx: mtk vcodec context information
> >> @@ -71,7 +71,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 media_request *src_buf_req;
> >> + struct vb2_v4l2_buffer *vb2_v4l2_src;
> >>
> >> void *private_data;
> >> struct mtk_vcodec_dec_ctx *ctx;
> >> --
> >> 2.46.0
> >>
> >
More information about the Linux-mediatek
mailing list