From: Irui Wang <irui.wang@mediatek.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
"Tzung-Bi Shih" <tzungbi@chromium.org>,
<angelogioacchino.delregno@collabora.com>,
<nicolas.dufresne@collabora.com>, <wenst@chromium.org>,
kyrie wu <kyrie.wu@mediatek.com>
Cc: <Project_Global_Chrome_Upstream_Group@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>,
Tomasz Figa <tfiga@chromium.org>, <xia.jiang@mediatek.com>,
<maoguang.meng@mediatek.com>, irui wang <irui.wang@mediatek.com>
Subject: [V15,13/15] media: mtk-jpegdec: add output pic reorder interface
Date: Mon, 26 Sep 2022 17:14:31 +0800 [thread overview]
Message-ID: <20220926091433.18633-14-irui.wang@mediatek.com> (raw)
In-Reply-To: <20220926091433.18633-1-irui.wang@mediatek.com>
From: kyrie wu <kyrie.wu@mediatek.com>
add output reorder func to reorder the output images
to ensure the output pic is consistent with the input images.
Signed-off-by: kyrie wu <kyrie.wu@mediatek.com>
Signed-off-by: irui wang <irui.wang@mediatek.com>
---
.../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 47 ++++++++++++++++++-
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
index f7e3013234d3..95fce3f3c0c6 100644
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
@@ -440,6 +440,49 @@ void mtk_jpeg_dec_set_config(void __iomem *base,
}
EXPORT_SYMBOL_GPL(mtk_jpeg_dec_set_config);
+static void mtk_jpegdec_put_buf(struct mtk_jpegdec_comp_dev *jpeg)
+{
+ struct mtk_jpeg_src_buf *dst_done_buf, *tmp_dst_done_buf;
+ struct vb2_v4l2_buffer *dst_buffer;
+ struct list_head *temp_entry;
+ struct list_head *pos = NULL;
+ struct mtk_jpeg_ctx *ctx;
+ unsigned long flags;
+
+ ctx = jpeg->hw_param.curr_ctx;
+ if (unlikely(!ctx)) {
+ dev_err(jpeg->dev, "comp_jpeg ctx fail !!!\n");
+ return;
+ }
+
+ dst_buffer = jpeg->hw_param.dst_buffer;
+ if (!dst_buffer) {
+ dev_err(jpeg->dev, "comp_jpeg dst_buffer fail !!!\n");
+ return;
+ }
+
+ dst_done_buf = container_of(dst_buffer, struct mtk_jpeg_src_buf, b);
+
+ spin_lock_irqsave(&ctx->done_queue_lock, flags);
+ list_add_tail(&dst_done_buf->list, &ctx->dst_done_queue);
+ while (!list_empty(&ctx->dst_done_queue) &&
+ (pos != &ctx->dst_done_queue)) {
+ list_for_each_prev_safe(pos, temp_entry, &ctx->dst_done_queue) {
+ tmp_dst_done_buf = list_entry(pos,
+ struct mtk_jpeg_src_buf,
+ list);
+ if (tmp_dst_done_buf->frame_num ==
+ ctx->last_done_frame_num) {
+ list_del(&tmp_dst_done_buf->list);
+ v4l2_m2m_buf_done(&tmp_dst_done_buf->b,
+ VB2_BUF_STATE_DONE);
+ ctx->last_done_frame_num++;
+ }
+ }
+ }
+ spin_unlock_irqrestore(&ctx->done_queue_lock, flags);
+}
+
static void mtk_jpegdec_timeout_work(struct work_struct *work)
{
enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
@@ -460,7 +503,7 @@ static void mtk_jpegdec_timeout_work(struct work_struct *work)
atomic_inc(&master_jpeg->dechw_rdy);
wake_up(&master_jpeg->dec_hw_wq);
v4l2_m2m_buf_done(src_buf, buf_state);
- v4l2_m2m_buf_done(dst_buf, buf_state);
+ mtk_jpegdec_put_buf(cjpeg);
}
static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)
@@ -500,7 +543,7 @@ static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)
buf_state = VB2_BUF_STATE_DONE;
v4l2_m2m_buf_done(src_buf, buf_state);
- v4l2_m2m_buf_done(dst_buf, buf_state);
+ mtk_jpegdec_put_buf(jpeg);
pm_runtime_put(ctx->jpeg->dev);
clk_disable_unprepare(jpeg->jdec_clk.clks->clk);
--
2.18.0
next prev parent reply other threads:[~2022-09-26 9:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 9:14 [V15,0/15] Enable jpeg enc & dec multi-hardwares for MT8195 Irui Wang
2022-09-26 9:14 ` [V15,01/15] dt-bindings: mediatek: Add mediatek, mt8195-jpgenc compatible Irui Wang
2022-09-26 14:07 ` Krzysztof Kozlowski
2022-09-26 9:14 ` [V15,02/15] mtk-jpegenc: export jpeg encoder functions Irui Wang
2022-09-26 9:14 ` [V15,03/15] mtk-jpegenc: support jpegenc multi-hardware Irui Wang
2022-09-26 9:14 ` [V15,04/15] mtk-jpegenc: add jpegenc timeout func interface Irui Wang
2022-09-26 9:14 ` [V15,05/15] mtk-jpegenc: add jpeg encode worker interface Irui Wang
2022-09-26 9:14 ` [V15,06/15] mtk-jpegenc: add output pic reorder interface Irui Wang
2022-09-26 9:14 ` [V15,07/15] mtk-jpegenc: add stop cmd interface for jpgenc Irui Wang
2022-09-26 9:14 ` [V15,08/15] dt-bindings: mediatek: Add mediatek,mt8195-jpgdec compatible Irui Wang
2022-09-26 14:07 ` Krzysztof Kozlowski
2022-09-26 9:14 ` [V15,09/15] media: mtk-jpegdec: export jpeg decoder functions Irui Wang
2022-09-26 9:14 ` [V15,10/15] media: mtk-jpegdec: support jpegdec multi-hardware Irui Wang
2022-09-26 9:14 ` [V15,11/15] media: mtk-jpegdec: add jpegdec timeout func interface Irui Wang
2022-09-26 9:14 ` [V15,12/15] media: mtk-jpegdec: add jpeg decode worker interface Irui Wang
2022-09-26 9:14 ` Irui Wang [this message]
2022-09-26 9:14 ` [V15,14/15] media: mtk-jpegdec: refactor jpegdec func interface Irui Wang
2022-09-26 9:14 ` [V15,15/15] mtk-jpegdec: add stop cmd interface for jpgdec Irui Wang
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=20220926091433.18633-14-irui.wang@mediatek.com \
--to=irui.wang@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=krzk+dt@kernel.org \
--cc=kyrie.wu@mediatek.com \
--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=maoguang.meng@mediatek.com \
--cc=matthias.bgg@gmail.com \
--cc=mchehab@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=robh+dt@kernel.org \
--cc=tfiga@chromium.org \
--cc=tzungbi@chromium.org \
--cc=wenst@chromium.org \
--cc=xia.jiang@mediatek.com \
/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;
as well as URLs for NNTP newsgroup(s).