| Message ID | 20240111071713.16331-1-yunfei.dong@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: mediatek: vcodec: setting request complete before buffer done | expand |
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;
I have seen issues with this patch. It does fix the original issue,
but now some kernel panics are occuring.
[ 369.634206] ------------[ cut here ]------------
[ 369.634214] __schedule+0x4bc/0x8b8
[ 369.634216] WARNING: CPU: 6 PID: 6520 at
drivers/media/common/videobuf2/videobuf2-core.c:1063
vb2_buffer_done+0x184/0x228 [videobuf2_common]
[ 369.634220] Modules linked in:
[ 369.634231] schedule+0x54/0xe0
[ 369.634232] 8021q veth rfcomm algif_hash
[ 369.634246] schedule_preempt_disabled+0x2c/0x48
[ 369.634247] algif_skcipher af_alg lzo_rle
[ 369.634262] __mutex_lock+0x138/0x2ac
[ 369.634272] __mutex_lock_slowpath+0x1c/0x28
[ 369.634281] mutex_lock+0x50/0x74
[ 369.634306] fops_vcodec_open+0x5c/0x2e0 [mtk_vcodec_dec
879370ff125adc9fa45bebb553dd6005c95bb957]
[ 369.634307] lzo_compress zram uinput xt_cgroup
[ 369.634322] v4l2_open+0xa8/0x104
[ 369.634323] xt_MASQUERADE mtk_vcodec_dec_hw cros_ec_rpmsg
[ 369.634339] chrdev_open+0x12c/0x1c4
[ 369.634340] mt7921e mt7921_common mt76_connac_lib mt76
[ 369.634355] do_dentry_open+0x114/0x37c
[ 369.634367] vfs_open+0x3c/0x48
[ 369.634377] path_openat+0x1c8/0x8ac
[ 369.634378] mtk_vcodec_dec v4l2_h264 mtk_vcodec_enc v4l2_vp9
[ 369.634393] do_filp_open+0x94/0x11c
[ 369.634395] uvcvideo mtk_vcodec_dbgfs mtk_mdp3
[ 369.634409] do_sys_openat2+0x88/0x220
[ 369.634419] do_sys_open+0x60/0x88
[ 369.634420] mtk_vcodec_common btusb mtk_vpu
[ 369.634433] __arm64_sys_openat+0x30/0x3c
[ 369.634435] btmtk videobuf2_vmalloc btintel videobuf2_dma_contig
[ 369.634450] el0_svc_common+0xcc/0x1cc
[ 369.634452] videobuf2_memops v4l2_mem2mem videobuf2_v4l2 btbcm
[ 369.634465] do_el0_svc+0x30/0x90
[ 369.634467] btrtl videobuf2_common mac80211 cros_ec_typec
[ 369.634480] el0_svc+0x10/0x1c
[ 369.634481] typec
[ 369.634491] PDLOG 2024/01/27 21:48:10.904 P0 SNK Charger ???
15175mV max 15000mV / 3000mA
[ 369.634492] snd_sof_mt8195 mtk_scp
[ 369.634506] el0_sync_handler+0x78/0x108
[ 369.634507] mtk_rpmsg snd_sof_xtensa_dsp
[ 369.634520] el0_sync+0x184/0x1c0
[ 369.634521] rpmsg_core mtk_adsp_common adsp_pcm mtk_scp_ipi
snd_sof_of snd_sof snd_sof_utils ip6table_nat fuse bluetooth
ecdh_generic ecc cfg80211 iio_trig_sysfs cros_ec_lid_angle
cros_ec_sensors cros_ec_sensors_core industrialio_triggered_buffer
kfifo_buf cros_ec_sensorhub r8153_ecm cdc_ether usbnet r8152 mii
joydev
[ 369.634539] CPU: 6 PID: 6520 Comm: ThreadPoolForeg Tainted: G
W 5.10.208-24103-g572c076ef3bf #1
69a06d15b220b7bbb6ae94835957d4263c132312
[ 369.634540] Hardware name: MediaTek Tomato board (DT)
[ 369.634541] pstate: 80400009 (Nzcv daif +PAN -UAO -TCO BTYPE=--)
[ 369.634544] pc : vb2_buffer_done+0x184/0x228 [videobuf2_common]
[ 369.634546] lr : vb2ops_vdec_stop_streaming+0x58/0x130 [mtk_vcodec_dec]
[ 369.634547] sp : ffffffc015be3a40
[ 369.634548] x29: ffffffc015be3a40 x28: 0000000000000013
[ 369.634550] x27: ffffffc015be3c70
[ 369.634554] Kernel panic - not syncing: hung_task: blocked tasks
[ 369.634556] x26: ffffffd6141bea30
[ 369.634563] x25: ffffff8d656e6020 x24: ffffff8d16fc0500
[ 369.634573] CPU: 3 PID: 68 Comm: khungtaskd Tainted: G W
5.10.208-24103-g572c076ef3bf #1
69a06d15b220b7bbb6ae94835957d4263c132312
[ 369.634574] x23: ffffff8d68cc94d0 x22: ffffff8d656e6328
[ 369.634585] Hardware name: MediaTek Tomato board (DT)
[ 369.634586] x21: 0000000000000000 x20: ffffff8d656e6208
[ 369.634592] Call trace:
[ 369.634593] x19: ffffff8d656e6000 x18: 0000000000001000
[ 369.634604] dump_backtrace+0x0/0x1e8
[ 369.634605] x17: 6165642820314e4f x16: ffffffd68b3da1ac
[ 369.634614] show_stack+0x20/0x2c
[ 369.634616] x15: 4c20736920747865 x14: 0000000000000003
[ 369.634625] dump_stack+0xd8/0x134
[ 369.634626] x13: 0000000000000004 x12: 000000017a6a3d80
[ 369.634635] panic+0x168/0x3b4
[ 369.634636] x11: c000000104dcc4c1 x10: 00000000ffffffff
[ 369.634648] hung_task_panic+0x0/0x3c
[ 369.634649] x9 : ffffffd6141ba860 x8 : 0000000000000000
[ 369.634660] kthread+0x140/0x150
[ 369.634662] x7 : 0000000000000000 x6 : 362e39363320205b
[ 369.634671] ret_from_fork+0x10/0x30
[ 369.634673] x5 : ffffffd68c1a9e40 x4 : 0000000000000000
[ 369.634676] x3 : ffffffc015be36a8 x2 : ffffffc015be36b0
[ 369.634678] x1 : 0000000000000006 x0 : ffffff8d79780400
[ 369.634680] Call trace:
[ 369.634682] vb2_buffer_done+0x184/0x228 [videobuf2_common
90d29a32bbd63b16e1c5ddef29383225f924f6e6]
[ 369.634684] vb2ops_vdec_stop_streaming+0x58/0x130 [mtk_vcodec_dec
879370ff125adc9fa45bebb553dd6005c95bb957]
[ 369.634687] SMP: stopping secondary CPUs
[ 369.634690] __vb2_queue_cancel+0x40/0x1f0 [videobuf2_common
90d29a32bbd63b16e1c5ddef29383225f924f6e6]
[ 369.634695] vb2_core_streamoff+0x30/0xb4 [videobuf2_common
90d29a32bbd63b16e1c5ddef29383225f924f6e6]
[ 369.634699] vb2_streamoff+0x38/0x60 [videobuf2_v4l2
57948a05e97f8b4aaa75f86af62463f9372d2eda]
[ 369.634702] v4l2_m2m_streamoff+0x60/0x13c [v4l2_mem2mem
b612f8be320a497ae465ef738b2ab624e86ad82f]
[ 369.634703] v4l2_m2m_ioctl_streamoff+0x20/0x2c [v4l2_mem2mem
b612f8be320a497ae465ef738b2ab624e86ad82f]
[ 369.634705] v4l_streamoff+0x2c/0x38
[ 369.634707] __video_do_ioctl+0x2c4/0x3dc
[ 369.634709] video_usercopy+0x6d8/0xfac
[ 369.634711] video_ioctl2+0x20/0x2c
[ 369.634712] v4l2_ioctl+0x54/0x64
[ 369.634714] __arm64_sys_ioctl+0x98/0xd0
[ 369.634716] el0_svc_common+0xcc/0x1cc
[ 369.634718] do_el0_svc+0x30/0x90
[ 369.634720] el0_svc+0x10/0x1c
[ 369.634722] el0_sync_handler+0x78/0x108
[ 369.634723] el0_sync+0x184/0x1c0
[ 369.634725] ---[ end trace bf910434181f5b65 ]---
[ 369.634735] Kernel Offset: 0x167a800000 from 0xffffffc010000000
[ 369.634747] PHYS_OFFSET: 0xfffffff400000000
[ 369.634760] CPU features: 0x08040026,6a80aa38
[ 369.634770] Memory Limit: none
On Thu, Jan 11, 2024 at 1:15 AM Benjamin Gaignard
<benjamin.gaignard@collabora.com> wrote:
>
>
> 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;
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;
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> --- .../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(-)