media: mediatek: vcodec: change lat thread decode error condition

If lat thread can't get lat buffer, it should be that current instance
don't be schedulded, the driver can't free the src buffer directly.

Fixes: 7b182b8d9c85 ("media: mediatek: vcodec: Refactor get and put capture buffer flow")
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c
index ab8f642d1e5b097567c5bc6045f646ce911697dc..3000db975e5f5fa2b6831ccae60b205809186cd8 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c
@@ -258,8 +258,10 @@ static void mtk_vdec_worker(struct work_struct *work)
                if (src_buf_req)
                        v4l2_ctrl_request_complete(src_buf_req, &ctx->ctrl_hdl);
        } else {
-               v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
-               v4l2_m2m_buf_done(vb2_v4l2_src, state);
+               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/vdec/vdec_h264_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c
index 955b2d0c8f53f74ce1c9176745c16171487b66f8..999ce7ee5fdc2027662ea06abfc09eb1a6280c15 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_h264_req_multi_if.c
@@ -597,7 +597,7 @@ static int vdec_h264_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
        lat_buf = vdec_msg_queue_dqbuf(&inst->ctx->msg_queue.lat_ctx);
        if (!lat_buf) {
                mtk_vcodec_err(inst, "failed to get lat buffer");
-               return -EINVAL;
+               return -EAGAIN;
        }
        share_info = lat_buf->private_data;
        src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer);

diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c
index cbb6728b8a40b3a2d2faa5993ff7393d2cfc0d46..cf16cf2807f0728ba46cdaa943a75715f194cbee 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c
+++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c
@@ -2070,7 +2070,7 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
        lat_buf = vdec_msg_queue_dqbuf(&instance->ctx->msg_queue.lat_ctx);
        if (!lat_buf) {
                mtk_vcodec_err(instance, "Failed to get VP9 lat buf\n");
-               return -EBUSY;
+               return -EAGAIN;
        }
        pfc = (struct vdec_vp9_slice_pfc *)lat_buf->private_data;
        if (!pfc) {