From: Kyrie Wu <kyrie.wu@mediatek.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
Kyrie Wu <kyrie.wu@mediatek.com>, <linux-media@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>
Subject: [PATCH v11 07/12] media: mediatek: jpeg: fix decoding resolution change operation
Date: Tue, 2 Dec 2025 17:47:55 +0800 [thread overview]
Message-ID: <20251202094800.6140-8-kyrie.wu@mediatek.com> (raw)
In-Reply-To: <20251202094800.6140-1-kyrie.wu@mediatek.com>
1.add a judgement for src buffer to avoid kernel crash
in the stop streaming function;
2.When a resolution changing occurs, it needs to set new
resolution parameter immediately and then report this event.
Otherwise, if the original software process is maintained,
the resolution change event is reported firstly, the CPU is
dispatched to the app to process the event, and the driver
does not set a new resolution, which will cause parameter errors.
3.After a resolution change occurred, decoding should not continue,
needs to wait until new buffers are ready and the state machine
changed.
Fixes: dedc21500334 ("media: mtk-jpegdec: add jpeg decode worker interface")
Signed-off-by: Kyrie Wu <kyrie.wu@mediatek.com>
---
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index 5ffaee4dcd19..9233bbfe2d97 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
@@ -887,7 +887,8 @@ static void mtk_jpeg_dec_stop_streaming(struct vb2_queue *q)
vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
src_buf = mtk_jpeg_vb2_to_srcbuf(&vb->vb2_buf);
- mtk_jpeg_set_queue_data(ctx, &src_buf->dec_param);
+ if (!IS_ERR_OR_NULL(src_buf))
+ mtk_jpeg_set_queue_data(ctx, &src_buf->dec_param);
ctx->state = MTK_JPEG_RUNNING;
} else if (V4L2_TYPE_IS_OUTPUT(q->type)) {
ctx->state = MTK_JPEG_INIT;
@@ -1749,11 +1750,15 @@ static void mtk_jpegdec_worker(struct work_struct *work)
if (mtk_jpeg_check_resolution_change(ctx,
&jpeg_src_buf->dec_param)) {
- mtk_jpeg_queue_src_chg_event(ctx);
+ mtk_jpeg_set_queue_data(ctx, &jpeg_src_buf->dec_param);
ctx->state = MTK_JPEG_SOURCE_CHANGE;
+ mtk_jpeg_queue_src_chg_event(ctx);
goto getbuf_fail;
}
+ if (ctx->state == MTK_JPEG_SOURCE_CHANGE)
+ goto getbuf_fail;
+
mtk_jpegdec_set_hw_param(ctx, hw_id, src_buf, dst_buf);
ret = pm_runtime_resume_and_get(comp_jpeg[hw_id]->dev);
if (ret < 0) {
--
2.45.2
next prev parent reply other threads:[~2025-12-02 9:48 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-02 9:47 [PATCH v11 00/12] Enable jpeg enc & dec multi-hardwares for MT8196 Kyrie Wu
2025-12-02 9:47 ` [PATCH v11 01/12] media: mediatek: jpeg: fix jpeg hw count setting Kyrie Wu
2025-12-16 20:57 ` Nicolas Dufresne
2025-12-25 2:20 ` Kyrie Wu (吴晗)
2025-12-02 9:47 ` [PATCH v11 02/12] media: mediatek: jpeg: fix jpeg buffer payload setting Kyrie Wu
2025-12-16 21:15 ` Nicolas Dufresne
2025-12-25 5:48 ` Kyrie Wu (吴晗)
2025-12-02 9:47 ` [PATCH v11 03/12] media: mediatek: jpeg: fix jpeg buffer layout Kyrie Wu
2025-12-16 21:22 ` Nicolas Dufresne
2025-12-25 6:05 ` Kyrie Wu (吴晗)
2026-01-05 19:20 ` Nicolas Dufresne
2025-12-02 9:47 ` [PATCH v11 04/12] media: mediatek: jpeg: fix stop streaming flow for multi-core Kyrie Wu
2025-12-16 21:27 ` Nicolas Dufresne
2025-12-25 6:12 ` Kyrie Wu (吴晗)
2025-12-02 9:47 ` [PATCH v11 05/12] media: mediatek: jpeg: fix multi-core clk suspend and resume setting Kyrie Wu
2025-12-16 21:33 ` Nicolas Dufresne
2025-12-25 6:35 ` Kyrie Wu (吴晗)
2025-12-02 9:47 ` [PATCH v11 06/12] media: mediatek: jpeg: fix decoding buffer number setting timing issue Kyrie Wu
2025-12-16 21:37 ` Nicolas Dufresne
2025-12-25 7:04 ` Kyrie Wu (吴晗)
2025-12-02 9:47 ` Kyrie Wu [this message]
2025-12-16 21:40 ` [PATCH v11 07/12] media: mediatek: jpeg: fix decoding resolution change operation Nicolas Dufresne
2025-12-25 7:05 ` Kyrie Wu (吴晗)
2025-12-02 9:47 ` [PATCH v11 08/12] media: mediatek: jpeg: fix remove buffer operation for multi-core Kyrie Wu
2025-12-16 21:43 ` Nicolas Dufresne
2025-12-25 7:15 ` Kyrie Wu (吴晗)
2025-12-02 9:47 ` [PATCH v11 09/12] media: dt-bindings: mediatek,jpeg: Add mediatek, mt8196-jpgdec compatible Kyrie Wu
2025-12-02 9:47 ` [PATCH v11 10/12] media: dt-bindings: mediatek,jpeg: Add mediatek, mt8196-jpgenc compatible Kyrie Wu
2025-12-02 9:47 ` [PATCH v11 11/12] media: mediatek: jpeg: add jpeg compatible Kyrie Wu
2025-12-16 21:49 ` Nicolas Dufresne
2025-12-02 9:48 ` [PATCH v11 12/12] media: mediatek: jpeg: add jpeg smmu sid setting Kyrie Wu
2025-12-16 21:48 ` Nicolas Dufresne
2025-12-25 7:17 ` Kyrie Wu (吴晗)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251202094800.6140-8-kyrie.wu@mediatek.com \
--to=kyrie.wu@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox