@@ -200,6 +200,8 @@ struct mtk_jpegdec_comp_dev {
struct mtk_jpeg_dev *master_dev;
struct mtk_jpegdec_pm pm;
int jpegdec_irq;
+ struct delayed_work job_timeout_work;
+ struct mtk_jpeg_hw_param hw_param;
};
/**
@@ -443,6 +443,24 @@ void mtk_jpeg_dec_set_config(void __iomem *base,
mtk_jpeg_dec_set_pause_mcu_idx(base, config->total_mcu);
}
+static void mtk_jpegdec_timeout_work(struct work_struct *work)
+{
+ enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
+ struct mtk_jpegdec_comp_dev *cjpeg =
+ container_of(work, struct mtk_jpegdec_comp_dev,
+ job_timeout_work.work);
+ struct vb2_v4l2_buffer *src_buf, *dst_buf;
+
+ src_buf = cjpeg->hw_param.src_buffer;
+ dst_buf = cjpeg->hw_param.dst_buffer;
+
+ mtk_jpeg_dec_reset(cjpeg->reg_base);
+ clk_disable_unprepare(cjpeg->pm.dec_clk.clk_info->jpegdec_clk);
+ pm_runtime_put(cjpeg->pm.dev);
+ v4l2_m2m_buf_done(src_buf, buf_state);
+ v4l2_m2m_buf_done(dst_buf, buf_state);
+}
+
int mtk_jpegdec_init_pm(struct mtk_jpegdec_comp_dev *mtkdev)
{
struct mtk_jpegdec_clk_info *clk_info;
@@ -507,6 +525,8 @@ static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)
struct mtk_jpegdec_comp_dev *jpeg = priv;
struct mtk_jpeg_dev *master_jpeg = jpeg->master_dev;
+ cancel_delayed_work(&jpeg->job_timeout_work);
+
irq_status = mtk_jpeg_dec_get_int_status(jpeg->reg_base);
dec_irq_ret = mtk_jpeg_dec_enum_result(irq_status);
if (dec_irq_ret >= MTK_JPEG_DEC_RESULT_UNDERFLOW)
@@ -592,6 +612,9 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
return -ENOMEM;
dev->plat_dev = pdev;
+
+ INIT_DELAYED_WORK(&dev->job_timeout_work, mtk_jpegdec_timeout_work);
+
ret = mtk_jpegdec_init_pm(dev);
if (ret) {
dev_err(&pdev->dev, "Failed to get jpeg enc clock source");
Generalizes jpegdec 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 | 2 ++ drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+)