| Message ID | 20241108033219.19804-4-yunfei.dong@mediatek.com |
|---|---|
| State | New |
| Headers | show |
| Series | media: mediatek: vcodec: fix v4l2_ctrl_request_complete fail | expand |
On Fri, Nov 8, 2024 at 11:32 AM Yunfei Dong <yunfei.dong@mediatek.com> wrote: > > Getting the SRC buffer from M2M will pick a different than the one > used for current decode operation when the SRC buffer is removed > from ready list. > > Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> > --- > .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c | 25 +++++++------------ > .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 24 ++++++------------ > 2 files changed, 17 insertions(+), 32 deletions(-) > > 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 90217cc8e242..0e1469effeb5 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 > @@ -1060,24 +1060,20 @@ static inline void vdec_av1_slice_vsi_to_remote(struct vdec_av1_slice_vsi *vsi, > memcpy(remote_vsi, vsi, sizeof(*vsi)); > } > > -static int vdec_av1_slice_setup_lat_from_src_buf(struct vdec_av1_slice_instance *instance, > - struct vdec_av1_slice_vsi *vsi, > - struct vdec_lat_buf *lat_buf) > +static void vdec_av1_slice_setup_lat_from_src_buf(struct vdec_av1_slice_instance *instance, > + struct vdec_av1_slice_vsi *vsi, > + struct mtk_vcodec_mem *bs, > + struct vdec_lat_buf *lat_buf) > { > - struct vb2_v4l2_buffer *src; > + struct mtk_video_dec_buf *src_buf_info; > struct vb2_v4l2_buffer *dst; > > - src = v4l2_m2m_next_src_buf(instance->ctx->m2m_ctx); > - if (!src) > - return -EINVAL; > - > - lat_buf->vb2_v4l2_src = src; > + src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer); > + lat_buf->vb2_v4l2_src = &src_buf_info->m2m_buf.vb; > > dst = &lat_buf->ts_info; > - v4l2_m2m_buf_copy_metadata(src, dst, true); > + v4l2_m2m_buf_copy_metadata(lat_buf->vb2_v4l2_src, dst, true); > vsi->frame.cur_ts = dst->vb2_buf.timestamp; > - > - return 0; > } > > static short vdec_av1_slice_resolve_divisor_32(u32 D, short *shift) > @@ -1724,10 +1720,7 @@ static int vdec_av1_slice_setup_lat(struct vdec_av1_slice_instance *instance, > struct vdec_av1_slice_vsi *vsi = &pfc->vsi; > int ret; > > - ret = vdec_av1_slice_setup_lat_from_src_buf(instance, vsi, lat_buf); > - if (ret) > - return ret; > - > + vdec_av1_slice_setup_lat_from_src_buf(instance, vsi, bs, lat_buf); > ret = vdec_av1_slice_setup_pfc(instance, pfc); > if (ret) > return ret; > 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 3dceb668ba1c..a56f6bb879a6 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 > @@ -711,21 +711,16 @@ int vdec_vp9_slice_setup_single_from_src_to_dst(struct vdec_vp9_slice_instance * > return 0; > } > > -static int vdec_vp9_slice_setup_lat_from_src_buf(struct vdec_vp9_slice_instance *instance, > - struct vdec_lat_buf *lat_buf) > +static void vdec_vp9_slice_setup_lat_from_src_buf(struct vdec_vp9_slice_instance *instance, > + struct mtk_vcodec_mem *bs, > + struct vdec_lat_buf *lat_buf) > { > - struct vb2_v4l2_buffer *src; > - struct vb2_v4l2_buffer *dst; > - > - src = v4l2_m2m_next_src_buf(instance->ctx->m2m_ctx); > - if (!src) > - return -EINVAL; > + struct mtk_video_dec_buf *src_buf_info; > > - lat_buf->vb2_v4l2_src = src; > + src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer); > + lat_buf->vb2_v4l2_src = &src_buf_info->m2m_buf.vb; > > - dst = &lat_buf->ts_info; > - v4l2_m2m_buf_copy_metadata(src, dst, true); > - return 0; > + v4l2_m2m_buf_copy_metadata(lat_buf->vb2_v4l2_src, &lat_buf->ts_info, true); > } > > static void vdec_vp9_slice_setup_hdr(struct vdec_vp9_slice_instance *instance, > @@ -1154,10 +1149,7 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance, > struct vdec_vp9_slice_vsi *vsi = &pfc->vsi; > int ret; > > - ret = vdec_vp9_slice_setup_lat_from_src_buf(instance, lat_buf); > - if (ret) > - goto err; > - > + vdec_vp9_slice_setup_lat_from_src_buf(instance, bs, lat_buf); > ret = vdec_vp9_slice_setup_pfc(instance, pfc); > if (ret) > goto err; > -- > 2.46.0 >
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 90217cc8e242..0e1469effeb5 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 @@ -1060,24 +1060,20 @@ static inline void vdec_av1_slice_vsi_to_remote(struct vdec_av1_slice_vsi *vsi, memcpy(remote_vsi, vsi, sizeof(*vsi)); } -static int vdec_av1_slice_setup_lat_from_src_buf(struct vdec_av1_slice_instance *instance, - struct vdec_av1_slice_vsi *vsi, - struct vdec_lat_buf *lat_buf) +static void vdec_av1_slice_setup_lat_from_src_buf(struct vdec_av1_slice_instance *instance, + struct vdec_av1_slice_vsi *vsi, + struct mtk_vcodec_mem *bs, + struct vdec_lat_buf *lat_buf) { - struct vb2_v4l2_buffer *src; + struct mtk_video_dec_buf *src_buf_info; struct vb2_v4l2_buffer *dst; - src = v4l2_m2m_next_src_buf(instance->ctx->m2m_ctx); - if (!src) - return -EINVAL; - - lat_buf->vb2_v4l2_src = src; + src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer); + lat_buf->vb2_v4l2_src = &src_buf_info->m2m_buf.vb; dst = &lat_buf->ts_info; - v4l2_m2m_buf_copy_metadata(src, dst, true); + v4l2_m2m_buf_copy_metadata(lat_buf->vb2_v4l2_src, dst, true); vsi->frame.cur_ts = dst->vb2_buf.timestamp; - - return 0; } static short vdec_av1_slice_resolve_divisor_32(u32 D, short *shift) @@ -1724,10 +1720,7 @@ static int vdec_av1_slice_setup_lat(struct vdec_av1_slice_instance *instance, struct vdec_av1_slice_vsi *vsi = &pfc->vsi; int ret; - ret = vdec_av1_slice_setup_lat_from_src_buf(instance, vsi, lat_buf); - if (ret) - return ret; - + vdec_av1_slice_setup_lat_from_src_buf(instance, vsi, bs, lat_buf); ret = vdec_av1_slice_setup_pfc(instance, pfc); if (ret) return ret; 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 3dceb668ba1c..a56f6bb879a6 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 @@ -711,21 +711,16 @@ int vdec_vp9_slice_setup_single_from_src_to_dst(struct vdec_vp9_slice_instance * return 0; } -static int vdec_vp9_slice_setup_lat_from_src_buf(struct vdec_vp9_slice_instance *instance, - struct vdec_lat_buf *lat_buf) +static void vdec_vp9_slice_setup_lat_from_src_buf(struct vdec_vp9_slice_instance *instance, + struct mtk_vcodec_mem *bs, + struct vdec_lat_buf *lat_buf) { - struct vb2_v4l2_buffer *src; - struct vb2_v4l2_buffer *dst; - - src = v4l2_m2m_next_src_buf(instance->ctx->m2m_ctx); - if (!src) - return -EINVAL; + struct mtk_video_dec_buf *src_buf_info; - lat_buf->vb2_v4l2_src = src; + src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer); + lat_buf->vb2_v4l2_src = &src_buf_info->m2m_buf.vb; - dst = &lat_buf->ts_info; - v4l2_m2m_buf_copy_metadata(src, dst, true); - return 0; + v4l2_m2m_buf_copy_metadata(lat_buf->vb2_v4l2_src, &lat_buf->ts_info, true); } static void vdec_vp9_slice_setup_hdr(struct vdec_vp9_slice_instance *instance, @@ -1154,10 +1149,7 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance, struct vdec_vp9_slice_vsi *vsi = &pfc->vsi; int ret; - ret = vdec_vp9_slice_setup_lat_from_src_buf(instance, lat_buf); - if (ret) - goto err; - + vdec_vp9_slice_setup_lat_from_src_buf(instance, bs, lat_buf); ret = vdec_vp9_slice_setup_pfc(instance, pfc); if (ret) goto err;
Getting the SRC buffer from M2M will pick a different than the one used for current decode operation when the SRC buffer is removed from ready list. Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> --- .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c | 25 +++++++------------ .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 24 ++++++------------ 2 files changed, 17 insertions(+), 32 deletions(-)