From: kyrie.wu <kyrie.wu@mediatek.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Tomasz Figa <tfiga@chromium.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
"Tzung-Bi Shih" <tzungbi@chromium.org>
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>, <xia.jiang@mediatek.com>,
<maoguang.meng@mediatek.com>, <srv_heupstream@mediatek.com>,
<kyrie.wu@mediatek.com>
Subject: [PATCH V3, 3/5] media: mtk-jpegenc: add jpegenc timeout func interface
Date: Fri, 24 Sep 2021 15:16:56 +0800 [thread overview]
Message-ID: <1632467818-26753-3-git-send-email-kyrie.wu@mediatek.com> (raw)
In-Reply-To: <1632467818-26753-1-git-send-email-kyrie.wu@mediatek.com>
Generalizes jpegenc timeout func interfaces to handle HW timeout.
Signed-off-by: kyrie.wu <kyrie.wu@mediatek.com>
---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++++++++
drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c | 23 +++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
index 9793ccb..0689bcb 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
@@ -75,6 +75,12 @@ struct mtk_jpeg_variant {
u32 cap_q_default_fourcc;
};
+struct mtk_jpeg_hw_param {
+ struct vb2_v4l2_buffer *src_buffer;
+ struct vb2_v4l2_buffer *dst_buffer;
+ struct mtk_jpeg_ctx *curr_ctx;
+};
+
enum mtk_jpegenc_hw_id {
MTK_JPEGENC_HW0,
MTK_JPEGENC_HW1,
@@ -120,6 +126,8 @@ struct mtk_jpegenc_comp_dev {
struct mtk_jpeg_dev *master_dev;
struct mtk_jpegenc_pm pm;
int jpegenc_irq;
+ struct delayed_work job_timeout_work;
+ struct mtk_jpeg_hw_param hw_param;
};
/**
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
index cf8a706..c3feb3a0 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
@@ -271,6 +271,25 @@ void mtk_jpegenc_release_pm(struct mtk_jpegenc_comp_dev *mtkdev)
pm_runtime_disable(&pdev->dev);
}
+static void mtk_jpegenc_timeout_work(struct work_struct *work)
+{
+ struct delayed_work *Pwork =
+ container_of(work, struct delayed_work, work);
+ struct mtk_jpegenc_comp_dev *cjpeg =
+ container_of(Pwork, struct mtk_jpegenc_comp_dev,
+ job_timeout_work);
+ struct vb2_v4l2_buffer *src_buf;
+ enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
+
+ src_buf = cjpeg->hw_param.src_buffer;
+
+ mtk_jpeg_enc_reset(cjpeg->reg_base);
+ clk_disable_unprepare(cjpeg->pm.venc_clk.clk_info->jpegenc_clk);
+ pm_runtime_put(cjpeg->pm.dev);
+
+ v4l2_m2m_buf_done(src_buf, buf_state);
+}
+
static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
{
struct mtk_jpegenc_comp_dev *jpeg = priv;
@@ -281,6 +300,8 @@ static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
enum vb2_buffer_state buf_state;
u32 result_size;
+ cancel_delayed_work(&jpeg->job_timeout_work);
+
irq_status = readl(jpeg->reg_base + JPEG_ENC_INT_STS) &
JPEG_ENC_INT_STATUS_MASK_ALLIRQ;
if (irq_status)
@@ -344,6 +365,8 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
dev->plat_dev = pdev;
+ INIT_DELAYED_WORK(&dev->job_timeout_work, mtk_jpegenc_timeout_work);
+
ret = mtk_jpegenc_init_pm(dev);
if (ret) {
dev_err(&pdev->dev, "Failed to get jpeg enc clock source");
--
2.6.4
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2021-09-24 7:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 7:16 [PATCH V3, 1/5] dt-bindings: mediatek: Add mediatek, mt8195-jpgenc compatible kyrie.wu
2021-09-24 7:16 ` [PATCH V3, 2/5] media: mtk-jpegenc: Use component framework to manage each hardware kyrie.wu
2021-09-24 7:16 ` kyrie.wu [this message]
2021-09-24 7:16 ` [PATCH V3,4/5] media: mtk-jpegenc: add jpeg encode worker interface kyrie.wu
2021-09-24 7:16 ` [PATCH V3,5/5] media: mtk-jpegenc: add output pic reorder interface 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=1632467818-26753-3-git-send-email-kyrie.wu@mediatek.com \
--to=kyrie.wu@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--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=robh+dt@kernel.org \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@chromium.org \
--cc=tzungbi@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).