Re: [PATCH v5 09/12] media: mediatek: jpeg: refactor multi-core clk suspend and resume setting

["Kyrie Wu (吴晗)" <Kyrie.Wu@mediatek.com>]

On Fri, 2025-05-30 at 13:43 -0400, Nicolas Dufresne wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> Hi,
> 
> Le vendredi 30 mai 2025 à 15:45 +0800, Kyrie Wu a écrit :
> > refactor jpeg clk suspend and resume setting for multi-core
> 
> You'll have to write a lot more to support such a large and I
> must say slightly convoluted change. Why do you need a special
> case for 1 core in the first place ? What about multi-core
> design that support from 1 to N cores without using different
> code path ?
> 
> Nicolas

Dear Nicolas,

For single core, the clock information is parsed and stored in the
struct of mtk_jpeg_dev, but multi-core's are in the struct of
mtk_jpegdec_comp_dev, it can not use a same software interface.

For a further thinking, it is also a fixes patch rather than
refactoring one. I will optimize this patch in v6.

Thanks.

Regards,
kyrie.
> 
> > 
> > Signed-off-by: Kyrie Wu <kyrie.wu@mediatek.com>
> > ---
> >  .../platform/mediatek/jpeg/mtk_jpeg_core.c    | 28 +++----
> >  .../platform/mediatek/jpeg/mtk_jpeg_dec_hw.c  | 75
> > ++++++++++++++++++-
> >  .../platform/mediatek/jpeg/mtk_jpeg_enc_hw.c  | 75
> > ++++++++++++++++++-
> >  3 files changed, 151 insertions(+), 27 deletions(-)
> > 
> > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> > b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> > index 1d3df1230191..c1d2de92f125 100644
> > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
> > @@ -1126,6 +1126,9 @@ static void mtk_jpeg_clk_on(struct
> > mtk_jpeg_dev *jpeg)
> >  {
> >       int ret;
> > 
> > +     if (jpeg->variant->multi_core)
> > +             return;
> > +
> >       ret = clk_bulk_prepare_enable(jpeg->variant->num_clks,
> >                                     jpeg->variant->clks);
> >       if (ret)
> > @@ -1134,6 +1137,9 @@ static void mtk_jpeg_clk_on(struct
> > mtk_jpeg_dev *jpeg)
> > 
> >  static void mtk_jpeg_clk_off(struct mtk_jpeg_dev *jpeg)
> >  {
> > +     if (jpeg->variant->multi_core)
> > +             return;
> > +
> >       clk_bulk_disable_unprepare(jpeg->variant->num_clks,
> >                                  jpeg->variant->clks);
> >  }
> > @@ -1677,13 +1683,6 @@ static void mtk_jpegenc_worker(struct
> > work_struct *work)
> >               goto enc_end;
> >       }
> > 
> > -     ret = clk_prepare_enable(comp_jpeg[hw_id]->venc_clk.clks-
> > >clk);
> > -     if (ret) {
> > -             dev_err(jpeg->dev, "%s : %d, jpegenc
> > clk_prepare_enable fail\n",
> > -                     __func__, __LINE__);
> > -             goto enc_end;
> > -     }
> > -
> >       v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> >       v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
> > 
> > @@ -1798,20 +1797,13 @@ static void mtk_jpegdec_worker(struct
> > work_struct *work)
> >       jpeg_dst_buf->frame_num = ctx->total_frame_num;
> > 
> >       mtk_jpegdec_set_hw_param(ctx, hw_id, src_buf, dst_buf);
> > -     ret = pm_runtime_get_sync(comp_jpeg[hw_id]->dev);
> > +     ret = pm_runtime_resume_and_get(comp_jpeg[hw_id]->dev);
> >       if (ret < 0) {
> >               dev_err(jpeg->dev, "%s : %d, pm_runtime_get_sync fail
> > !!!\n",
> >                       __func__, __LINE__);
> >               goto dec_end;
> >       }
> > 
> > -     ret = clk_prepare_enable(comp_jpeg[hw_id]->jdec_clk.clks-
> > >clk);
> > -     if (ret) {
> > -             dev_err(jpeg->dev, "%s : %d, jpegdec
> > clk_prepare_enable fail\n",
> > -                     __func__, __LINE__);
> > -             goto clk_end;
> > -     }
> > -
> >       v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> >       v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
> > 
> > @@ -1821,7 +1813,7 @@ static void mtk_jpegdec_worker(struct
> > work_struct *work)
> >                                &dst_buf->vb2_buf, &fb)) {
> >               dev_err(jpeg->dev, "%s : %d, mtk_jpeg_set_dec_dst
> > fail\n",
> >                       __func__, __LINE__);
> > -             goto setdst_end;
> > +             goto set_dst_fail;
> >       }
> > 
> >       schedule_delayed_work(&comp_jpeg[hw_id]->job_timeout_work,
> > @@ -1846,9 +1838,7 @@ static void mtk_jpegdec_worker(struct
> > work_struct *work)
> > 
> >       return;
> > 
> > -setdst_end:
> > -     clk_disable_unprepare(comp_jpeg[hw_id]->jdec_clk.clks->clk);
> > -clk_end:
> > +set_dst_fail:
> >       pm_runtime_put(comp_jpeg[hw_id]->dev);
> >  dec_end:
> >       v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
> > 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 2e6da8617484..db2afc5151ad 100644
> > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
> > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c
> > @@ -543,14 +543,13 @@ static void mtk_jpegdec_timeout_work(struct
> > work_struct *work)
> >       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);
> >       cjpeg->hw_state = MTK_JPEG_HW_IDLE;
> >       atomic_inc(&master_jpeg->hw_rdy);
> >       wake_up(&master_jpeg->hw_wq);
> >       v4l2_m2m_buf_done(src_buf, buf_state);
> >       mtk_jpegdec_put_buf(cjpeg);
> >       jpeg_buf_queue_dec(ctx);
> > +     pm_runtime_put(cjpeg->dev);
> >  }
> > 
> >  static irqreturn_t mtk_jpegdec_hw_irq_handler(int irq, void *priv)
> > @@ -592,12 +591,11 @@ static irqreturn_t
> > mtk_jpegdec_hw_irq_handler(int irq, void *priv)
> >       v4l2_m2m_buf_done(src_buf, buf_state);
> >       mtk_jpegdec_put_buf(jpeg);
> >       jpeg_buf_queue_dec(ctx);
> > -     pm_runtime_put(ctx->jpeg->dev);
> > -     clk_disable_unprepare(jpeg->jdec_clk.clks->clk);
> > 
> >       jpeg->hw_state = MTK_JPEG_HW_IDLE;
> >       wake_up(&master_jpeg->hw_wq);
> >       atomic_inc(&master_jpeg->hw_rdy);
> > +     pm_runtime_put(jpeg->dev);
> > 
> >       return IRQ_HANDLED;
> >  }
> > @@ -703,15 +701,84 @@ static int mtk_jpegdec_hw_probe(struct
> > platform_device *pdev)
> > 
> >       platform_set_drvdata(pdev, dev);
> >       pm_runtime_enable(&pdev->dev);
> > +     ret = devm_clk_bulk_get(dev->dev,
> > +                             jpegdec_clk->clk_num,
> > +                             jpegdec_clk->clks);
> > +     if (ret) {
> > +             dev_err(&pdev->dev, "Failed to init clk\n");
> > +             return ret;
> > +     }
> > +
> > +     return 0;
> > +}
> > +
> > +static void mtk_jpeg_clk_on(struct mtk_jpegdec_comp_dev *jpeg)
> > +{
> > +     int ret;
> > +
> > +     ret = clk_bulk_prepare_enable(jpeg->jdec_clk.clk_num,
> > +                                   jpeg->jdec_clk.clks);
> > +     if (ret)
> > +             dev_err(jpeg->dev, "%s : %d, jpegdec
> > clk_prepare_enable fail\n",
> > +                     __func__, __LINE__);
> > +}
> > +
> > +static void mtk_jpeg_clk_off(struct mtk_jpegdec_comp_dev *jpeg)
> > +{
> > +     clk_bulk_disable_unprepare(jpeg->jdec_clk.clk_num,
> > +                                jpeg->jdec_clk.clks);
> > +}
> > +
> > +static __maybe_unused int mtk_jpegdec_pm_suspend(struct device
> > *dev)
> > +{
> > +     struct mtk_jpegdec_comp_dev *jpeg = dev_get_drvdata(dev);
> > +
> > +     mtk_jpeg_clk_off(jpeg);
> > 
> >       return 0;
> >  }
> > 
> > +static __maybe_unused int mtk_jpegdec_pm_resume(struct device
> > *dev)
> > +{
> > +     struct mtk_jpegdec_comp_dev *jpeg = dev_get_drvdata(dev);
> > +
> > +     mtk_jpeg_clk_on(jpeg);
> > +
> > +     return 0;
> > +}
> > +
> > +static __maybe_unused int mtk_jpegdec_suspend(struct device *dev)
> > +{
> > +     struct mtk_jpegdec_comp_dev *jpeg = dev_get_drvdata(dev);
> > +
> > +     v4l2_m2m_suspend(jpeg->master_dev->m2m_dev);
> > +     return pm_runtime_force_suspend(dev);
> > +}
> > +
> > +static __maybe_unused int mtk_jpegdec_resume(struct device *dev)
> > +{
> > +     struct mtk_jpegdec_comp_dev *jpeg = dev_get_drvdata(dev);
> > +     int ret;
> > +
> > +     ret = pm_runtime_force_resume(dev);
> > +     if (ret < 0)
> > +             return ret;
> > +
> > +     v4l2_m2m_resume(jpeg->master_dev->m2m_dev);
> > +     return ret;
> > +}
> > +
> > +static const struct dev_pm_ops mtk_jpegdec_pm_ops = {
> > +     SET_SYSTEM_SLEEP_PM_OPS(mtk_jpegdec_suspend,
> > mtk_jpegdec_resume)
> > +     SET_RUNTIME_PM_OPS(mtk_jpegdec_pm_suspend,
> > mtk_jpegdec_pm_resume, NULL)
> > +};
> > +
> >  static struct platform_driver mtk_jpegdec_hw_driver = {
> >       .probe = mtk_jpegdec_hw_probe,
> >       .driver = {
> >               .name = "mtk-jpegdec-hw",
> >               .of_match_table = mtk_jpegdec_hw_ids,
> > +             .pm             = &mtk_jpegdec_pm_ops,
> >       },
> >  };
> > 
> > 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 ff73393a2417..27da2a9922a6 100644
> > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c
> > @@ -274,14 +274,13 @@ static void mtk_jpegenc_timeout_work(struct
> > work_struct *work)
> >       v4l2_m2m_buf_copy_metadata(src_buf, dst_buf, true);
> > 
> >       mtk_jpeg_enc_reset(cjpeg->reg_base);
> > -     clk_disable_unprepare(cjpeg->venc_clk.clks->clk);
> > -     pm_runtime_put(cjpeg->dev);
> >       cjpeg->hw_state = MTK_JPEG_HW_IDLE;
> >       atomic_inc(&master_jpeg->hw_rdy);
> >       wake_up(&master_jpeg->hw_wq);
> >       v4l2_m2m_buf_done(src_buf, buf_state);
> >       mtk_jpegenc_put_buf(cjpeg);
> >       jpeg_buf_queue_dec(ctx);
> > +     pm_runtime_put(cjpeg->dev);
> >  }
> > 
> >  static irqreturn_t mtk_jpegenc_hw_irq_handler(int irq, void *priv)
> > @@ -316,12 +315,11 @@ static irqreturn_t
> > mtk_jpegenc_hw_irq_handler(int irq, void *priv)
> >       v4l2_m2m_buf_done(src_buf, buf_state);
> >       mtk_jpegenc_put_buf(jpeg);
> >       jpeg_buf_queue_dec(ctx);
> > -     pm_runtime_put(ctx->jpeg->dev);
> > -     clk_disable_unprepare(jpeg->venc_clk.clks->clk);
> > 
> >       jpeg->hw_state = MTK_JPEG_HW_IDLE;
> >       wake_up(&master_jpeg->hw_wq);
> >       atomic_inc(&master_jpeg->hw_rdy);
> > +     pm_runtime_put(jpeg->dev);
> > 
> >       return IRQ_HANDLED;
> >  }
> > @@ -425,15 +423,84 @@ static int mtk_jpegenc_hw_probe(struct
> > platform_device *pdev)
> > 
> >       platform_set_drvdata(pdev, dev);
> >       pm_runtime_enable(&pdev->dev);
> > +     ret = devm_clk_bulk_get(dev->dev,
> > +                             jpegenc_clk->clk_num,
> > +                             jpegenc_clk->clks);
> > +     if (ret) {
> > +             dev_err(&pdev->dev, "Failed to init clk\n");
> > +             return ret;
> > +     }
> > +
> > +     return 0;
> > +}
> > +
> > +static void mtk_jpeg_clk_on(struct mtk_jpegenc_comp_dev *jpeg)
> > +{
> > +     int ret;
> > +
> > +     ret = clk_bulk_prepare_enable(jpeg->venc_clk.clk_num,
> > +                                   jpeg->venc_clk.clks);
> > +     if (ret)
> > +             dev_err(jpeg->dev, "%s : %d, jpegenc
> > clk_prepare_enable fail\n",
> > +                     __func__, __LINE__);
> > +}
> > +
> > +static void mtk_jpeg_clk_off(struct mtk_jpegenc_comp_dev *jpeg)
> > +{
> > +     clk_bulk_disable_unprepare(jpeg->venc_clk.clk_num,
> > +                                jpeg->venc_clk.clks);
> > +}
> > +
> > +static __maybe_unused int mtk_jpegenc_pm_suspend(struct device
> > *dev)
> > +{
> > +     struct mtk_jpegenc_comp_dev *jpeg = dev_get_drvdata(dev);
> > +
> > +     mtk_jpeg_clk_off(jpeg);
> > 
> >       return 0;
> >  }
> > 
> > +static __maybe_unused int mtk_jpegenc_pm_resume(struct device
> > *dev)
> > +{
> > +     struct mtk_jpegenc_comp_dev *jpeg = dev_get_drvdata(dev);
> > +
> > +     mtk_jpeg_clk_on(jpeg);
> > +
> > +     return 0;
> > +}
> > +
> > +static __maybe_unused int mtk_jpegenc_suspend(struct device *dev)
> > +{
> > +     struct mtk_jpegenc_comp_dev *jpeg = dev_get_drvdata(dev);
> > +
> > +     v4l2_m2m_suspend(jpeg->master_dev->m2m_dev);
> > +     return pm_runtime_force_suspend(dev);
> > +}
> > +
> > +static __maybe_unused int mtk_jpegenc_resume(struct device *dev)
> > +{
> > +     struct mtk_jpegenc_comp_dev *jpeg = dev_get_drvdata(dev);
> > +     int ret;
> > +
> > +     ret = pm_runtime_force_resume(dev);
> > +     if (ret < 0)
> > +             return ret;
> > +
> > +     v4l2_m2m_resume(jpeg->master_dev->m2m_dev);
> > +     return ret;
> > +}
> > +
> > +static const struct dev_pm_ops mtk_jpegenc_pm_ops = {
> > +     SET_SYSTEM_SLEEP_PM_OPS(mtk_jpegenc_suspend,
> > mtk_jpegenc_resume)
> > +     SET_RUNTIME_PM_OPS(mtk_jpegenc_pm_suspend,
> > mtk_jpegenc_pm_resume, NULL)
> > +};
> > +
> >  static struct platform_driver mtk_jpegenc_hw_driver = {
> >       .probe = mtk_jpegenc_hw_probe,
> >       .driver = {
> >               .name = "mtk-jpegenc-hw",
> >               .of_match_table = mtk_jpegenc_drv_ids,
> > +             .pm = &mtk_jpegenc_pm_ops,
> >       },
> >  };
> >