lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[V15,11/15] media: mtk-jpegdec: add jpegdec timeout func interface
    Date
    From: kyrie wu <kyrie.wu@mediatek.com>

    Generalizes jpegdec timeout func interfaces to handle HW timeout.

    Signed-off-by: kyrie wu <kyrie.wu@mediatek.com>
    Signed-off-by: irui wang <irui.wang@mediatek.com>
    ---
    .../platform/mediatek/jpeg/mtk_jpeg_core.h | 4 ++++
    .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 24 +++++++++++++++++++
    2 files changed, 28 insertions(+)

    diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
    index dd974409ae5e..391c4ec25b2c 100644
    --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
    +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
    @@ -165,6 +165,8 @@ struct mtk_jpegenc_comp_dev {
    * @master_dev: mtk_jpeg_dev device
    * @jdec_clk: mtk_jpegdec_clk
    * @jpegdec_irq: jpeg decode irq num
    + * @job_timeout_work: decode timeout workqueue
    + * @hw_param: jpeg decode hw parameters
    */
    struct mtk_jpegdec_comp_dev {
    struct device *dev;
    @@ -173,6 +175,8 @@ struct mtk_jpegdec_comp_dev {
    struct mtk_jpeg_dev *master_dev;
    struct mtk_jpegdec_clk jdec_clk;
    int jpegdec_irq;
    + struct delayed_work job_timeout_work;
    + struct mtk_jpeg_hw_param hw_param;
    };

    /**
    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 bab50f750113..d65cc0a3b663 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,25 @@ void mtk_jpeg_dec_set_config(void __iomem *base,
    }
    EXPORT_SYMBOL_GPL(mtk_jpeg_dec_set_config);

    +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;
    + v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
    +
    + mtk_jpeg_dec_reset(cjpeg->reg_base);
    + clk_disable_unprepare(cjpeg->jdec_clk.clks->clk);
    + pm_runtime_put(cjpeg->dev);
    + v4l2_m2m_buf_done(src_buf, buf_state);
    + v4l2_m2m_buf_done(dst_buf, buf_state);
    +}
    +
    static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)
    {
    struct vb2_v4l2_buffer *src_buf, *dst_buf;
    @@ -453,6 +472,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)
    @@ -538,6 +559,9 @@ static int mtk_jpegdec_hw_probe(struct platform_device *pdev)
    master_dev->dec_hw_dev[i] = NULL;
    }

    + INIT_DELAYED_WORK(&dev->job_timeout_work,
    + mtk_jpegdec_timeout_work);
    +
    jpegdec_clk = &dev->jdec_clk;

    jpegdec_clk->clk_num = devm_clk_bulk_get_all(&pdev->dev,
    --
    2.18.0
    \
     
     \ /
      Last update: 2022-09-26 11:16    [W:2.694 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site