[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240321014754.6540-1-irui.wang@mediatek.com>
Date: Thu, 21 Mar 2024 09:47:54 +0800
From: Irui Wang <irui.wang@...iatek.com>
To: Hans Verkuil <hverkuil-cisco@...all.nl>, Mauro Carvalho Chehab
<mchehab@...nel.org>, Matthias Brugger <matthias.bgg@...il.com>, Yunfei Dong
<yunfei.dong@...iatek.com>, <angelogioacchino.delregno@...labora.com>,
<nicolas.dufresne@...labora.com>, <sebastian.fricke@...labora.com>
CC: Longfei Wang <longfei.wang@...iatek.com>, Maoguang Meng
<maoguang.meng@...iatek.com>, Irui Wang <irui.wang@...iatek.com>,
<Project_Global_Chrome_Upstream_Group@...iatek.com>,
<linux-media@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>, <linux-mediatek@...ts.infradead.org>
Subject: [PATCH v2] media: mediatek: vcodec: Handle invalid decoder vsi
Handle invalid decoder vsi in vpu_dec_init to ensure the decoder vsi is
valid for future use.
Fixes: 590577a4e525 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Decoder Driver")
Signed-off-by: Irui Wang <irui.wang@...iatek.com>
---
changed with v1:
- add Fixes tag
---
.../media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
index 82e57ae983d5..17770993fe5a 100644
--- a/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
+++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.c
@@ -231,6 +231,12 @@ int vpu_dec_init(struct vdec_vpu_inst *vpu)
mtk_vdec_debug(vpu->ctx, "vdec_inst=%p", vpu);
err = vcodec_vpu_send_msg(vpu, (void *)&msg, sizeof(msg));
+
+ if (IS_ERR_OR_NULL(vpu->vsi)) {
+ mtk_vdec_err(vpu->ctx, "invalid vdec vsi, status=%d", err);
+ return -EINVAL;
+ }
+
mtk_vdec_debug(vpu->ctx, "- ret=%d", err);
return err;
}
--
2.18.0
Powered by blists - more mailing lists