Le lundi 13 juin 2022 à 11:23 +0800, Irui Wang a écrit :
> From: kyrie wu <kyrie.wu@xxxxxxxxxxxx>
>
> Generalizes jpegenc timeout func interfaces to handle HW timeout.
>
> Signed-off-by: kyrie wu <kyrie.wu@xxxxxxxxxxxx>
> ---
> .../platform/mediatek/jpeg/mtk_jpeg_core.h | 8 ++++++
> .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 25 +++++++++++++++++++
> 2 files changed, 33 insertions(+)
>
> diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> index f6e980fde4ef..0683d80fcea5 100644
> --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h
> @@ -76,6 +76,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,
> @@ -107,6 +113,8 @@ struct mtk_jpegenc_comp_dev {
> struct mtk_jpegenc_clk venc_clk;
> int jpegenc_irq;
> int hw_id;
> + struct delayed_work job_timeout_work;
> + struct mtk_jpeg_hw_param hw_param;
> };
>
> /**
> diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> index 8ac6b031dcd4..99f3db2a393a 100644
> --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> @@ -185,6 +185,26 @@ void mtk_jpeg_set_enc_params(struct mtk_jpeg_ctx *ctx, void __iomem *base)
> }
> EXPORT_SYMBOL_GPL(mtk_jpeg_set_enc_params);
>
> +static void mtk_jpegenc_timeout_work(struct work_struct *work)
> +{
> + struct delayed_work *dly_work = to_delayed_work(work);
> + struct mtk_jpegenc_comp_dev *cjpeg =
> + container_of(dly_work,
> + struct mtk_jpegenc_comp_dev,
> + job_timeout_work);
> + enum vb2_buffer_state buf_state = VB2_BUF_STATE_ERROR;
> + struct vb2_v4l2_buffer *src_buf, *dst_buf;
> +
> + src_buf = cjpeg->hw_param.src_buffer;
> + dst_buf = cjpeg->hw_param.dst_buffer;
> + dst_buf->vb2_buf.timestamp = src_buf->vb2_buf.timestamp;
Another case for v4l2_m2m_buf_copy_metadata? As you know early the dst_buf, you
could do that once before you start the encoding, this could possibly remove the
duplication.
> +
> + mtk_jpeg_enc_reset(cjpeg->reg_base);
> + clk_disable_unprepare(cjpeg->venc_clk.clks->clk);
> + pm_runtime_put(cjpeg->dev);
> + v4l2_m2m_buf_done(src_buf, buf_state);
> +}
> +
> static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
> {
> struct vb2_v4l2_buffer *src_buf, *dst_buf;
> @@ -196,6 +216,8 @@ static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
> struct mtk_jpegenc_comp_dev *jpeg = priv;
> struct mtk_jpeg_dev *master_jpeg = jpeg->master_dev;
>
> + 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)
> @@ -272,6 +294,9 @@ static int mtk_jpegenc_hw_probe(struct platform_device *pdev)
> dev->plat_dev = pdev;
> dev->dev = &pdev->dev;
>
> + INIT_DELAYED_WORK(&dev->job_timeout_work,
> + mtk_jpegenc_timeout_work);
> +
> jpegenc_clk = &dev->venc_clk;
>
> jpegenc_clk->clk_num = devm_clk_bulk_get_all(&pdev->dev,
