media: mediatek: vcodec: Setting lat buf to lat_list when lat decode error

[ Upstream commit 12ac20d60213a439d1552382d04aabb905e0b784 ]

Need to set lat buf to lat_list when lat decode error, or lat buffer will
be lost.

Fixes: 5d418351ca8f ("media: mediatek: vcodec: support stateless VP9 decoding")
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

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 fb1c36a3592d1cf5dc0336a750ced1a3e84c677a..cbb6728b8a40b3a2d2faa5993ff7393d2cfc0d46 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
@@ -2073,21 +2073,23 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
                return -EBUSY;
        }
        pfc = (struct vdec_vp9_slice_pfc *)lat_buf->private_data;
-       if (!pfc)
-               return -EINVAL;
+       if (!pfc) {
+               ret = -EINVAL;
+               goto err_free_fb_out;
+       }
        vsi = &pfc->vsi;
 
        ret = vdec_vp9_slice_setup_lat(instance, bs, lat_buf, pfc);
        if (ret) {
                mtk_vcodec_err(instance, "Failed to setup VP9 lat ret %d\n", ret);
-               return ret;
+               goto err_free_fb_out;
        }
        vdec_vp9_slice_vsi_to_remote(vsi, instance->vsi);
 
        ret = vpu_dec_start(&instance->vpu, NULL, 0);
        if (ret) {
                mtk_vcodec_err(instance, "Failed to dec VP9 ret %d\n", ret);
-               return ret;
+               goto err_free_fb_out;
        }
 
        if (instance->irq) {
@@ -2107,7 +2109,7 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
        /* LAT trans full, no more UBE or decode timeout */
        if (ret) {
                mtk_vcodec_err(instance, "VP9 decode error: %d\n", ret);
-               return ret;
+               goto err_free_fb_out;
        }
 
        mtk_vcodec_debug(instance, "lat dma addr: 0x%lx 0x%lx\n",
@@ -2120,6 +2122,9 @@ static int vdec_vp9_slice_lat_decode(void *h_vdec, struct mtk_vcodec_mem *bs,
        vdec_msg_queue_qbuf(&ctx->dev->msg_queue_core_ctx, lat_buf);
 
        return 0;
+err_free_fb_out:
+       vdec_msg_queue_qbuf(&ctx->msg_queue.lat_ctx, lat_buf);
+       return ret;
 }
 
 static int vdec_vp9_slice_decode(void *h_vdec, struct mtk_vcodec_mem *bs,