| Message ID | 20211112105509.12010-13-yong.wu@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Clean up "mediatek,larb" | expand |
Il 12/11/21 11:55, Yong Wu ha scritto: > After this patchset, mtk_vcodec_release_enc_pm has only one line. > then remove that function, use pm_runtime_disable instead. > > meanwhile, mtk_vcodec_init_enc_pm only operate for the clocks, > rename it from the _pm to _clk. > > No functional change. > > CC: Tiffany Lin <tiffany.lin@mediatek.com> > CC: Irui Wang <irui.wang@mediatek.com> > Signed-off-by: Yong Wu <yong.wu@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Il 11/01/22 11:57, AngeloGioacchino Del Regno ha scritto: > Il 12/11/21 11:55, Yong Wu ha scritto: >> After this patchset, mtk_vcodec_release_enc_pm has only one line. >> then remove that function, use pm_runtime_disable instead. >> >> meanwhile, mtk_vcodec_init_enc_pm only operate for the clocks, >> rename it from the _pm to _clk. >> >> No functional change. >> >> CC: Tiffany Lin <tiffany.lin@mediatek.com> >> CC: Irui Wang <irui.wang@mediatek.com> >> Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Hello Yong, the mtk-vcodec patches were merged in Yunfei's vcodec patch series and Hans has scheduled that for v5.18. Can you please send a v10 and drop patches 10/15, 11/15, 12/15 (all of the media: mtk-vcodec: *) from this series? For the records, I think that after sending v10 this series is ready to be merged, as it was well reviewed and also tested on many MTK platforms. Thank you, - Angelo
On 13/01/2022 11:11, AngeloGioacchino Del Regno wrote: > Il 11/01/22 11:57, AngeloGioacchino Del Regno ha scritto: >> Il 12/11/21 11:55, Yong Wu ha scritto: >>> After this patchset, mtk_vcodec_release_enc_pm has only one line. >>> then remove that function, use pm_runtime_disable instead. >>> >>> meanwhile, mtk_vcodec_init_enc_pm only operate for the clocks, >>> rename it from the _pm to _clk. >>> >>> No functional change. >>> >>> CC: Tiffany Lin <tiffany.lin@mediatek.com> >>> CC: Irui Wang <irui.wang@mediatek.com> >>> Signed-off-by: Yong Wu <yong.wu@mediatek.com> >> >> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >> > > Hello Yong, > the mtk-vcodec patches were merged in Yunfei's vcodec patch series and Hans has > scheduled that for v5.18. > > Can you please send a v10 and drop patches 10/15, 11/15, 12/15 (all of the > media: mtk-vcodec: *) from this series? > > For the records, I think that after sending v10 this series is ready to be merged, > as it was well reviewed and also tested on many MTK platforms. Good to know. When I have the v10 I'll try to prioritize reviewing it and running my usual tests. Yong, please make sure you run 'checkpatch.pl --strict' over the v10 patches and fix any issues (using common sense). Regards, Hans > > Thank you, > - Angelo
Il 13/01/22 11:15, Hans Verkuil ha scritto: > On 13/01/2022 11:11, AngeloGioacchino Del Regno wrote: >> Il 11/01/22 11:57, AngeloGioacchino Del Regno ha scritto: >>> Il 12/11/21 11:55, Yong Wu ha scritto: >>>> After this patchset, mtk_vcodec_release_enc_pm has only one line. >>>> then remove that function, use pm_runtime_disable instead. >>>> >>>> meanwhile, mtk_vcodec_init_enc_pm only operate for the clocks, >>>> rename it from the _pm to _clk. >>>> >>>> No functional change. >>>> >>>> CC: Tiffany Lin <tiffany.lin@mediatek.com> >>>> CC: Irui Wang <irui.wang@mediatek.com> >>>> Signed-off-by: Yong Wu <yong.wu@mediatek.com> >>> >>> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >>> >> >> Hello Yong, >> the mtk-vcodec patches were merged in Yunfei's vcodec patch series and Hans has >> scheduled that for v5.18. >> >> Can you please send a v10 and drop patches 10/15, 11/15, 12/15 (all of the >> media: mtk-vcodec: *) from this series? >> >> For the records, I think that after sending v10 this series is ready to be merged, >> as it was well reviewed and also tested on many MTK platforms. > > Good to know. When I have the v10 I'll try to prioritize reviewing it and running > my usual tests. Thank you Hans, that's very much appreciated! > > Yong, please make sure you run 'checkpatch.pl --strict' over the v10 patches and fix > any issues (using common sense). > > Regards, > > Hans > >> >> Thank you, >> - Angelo >
Hi Hans, On 13/01/2022 11:15, Hans Verkuil wrote: > On 13/01/2022 11:11, AngeloGioacchino Del Regno wrote: >> Il 11/01/22 11:57, AngeloGioacchino Del Regno ha scritto: >>> Il 12/11/21 11:55, Yong Wu ha scritto: >>>> After this patchset, mtk_vcodec_release_enc_pm has only one line. >>>> then remove that function, use pm_runtime_disable instead. >>>> >>>> meanwhile, mtk_vcodec_init_enc_pm only operate for the clocks, >>>> rename it from the _pm to _clk. >>>> >>>> No functional change. >>>> >>>> CC: Tiffany Lin <tiffany.lin@mediatek.com> >>>> CC: Irui Wang <irui.wang@mediatek.com> >>>> Signed-off-by: Yong Wu <yong.wu@mediatek.com> >>> >>> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >>> >> >> Hello Yong, >> the mtk-vcodec patches were merged in Yunfei's vcodec patch series and Hans has >> scheduled that for v5.18. >> >> Can you please send a v10 and drop patches 10/15, 11/15, 12/15 (all of the >> media: mtk-vcodec: *) from this series? >> >> For the records, I think that after sending v10 this series is ready to be merged, >> as it was well reviewed and also tested on many MTK platforms. > > Good to know. When I have the v10 I'll try to prioritize reviewing it and running > my usual tests. > > Yong, please make sure you run 'checkpatch.pl --strict' over the v10 patches and fix > any issues (using common sense). > Can you please take me in the look when you take the patches. I'll take the DTS related as soon as you queue up the others. Thanks! Matthias > Regards, > > Hans > >> >> Thank you, >> - Angelo >
On Thu, 2022-01-13 at 17:10 +0100, Matthias Brugger wrote: > Hi Hans, > > On 13/01/2022 11:15, Hans Verkuil wrote: > > On 13/01/2022 11:11, AngeloGioacchino Del Regno wrote: > > > Il 11/01/22 11:57, AngeloGioacchino Del Regno ha scritto: > > > > Il 12/11/21 11:55, Yong Wu ha scritto: > > > > > After this patchset, mtk_vcodec_release_enc_pm has only one > > > > > line. > > > > > then remove that function, use pm_runtime_disable instead. > > > > > > > > > > meanwhile, mtk_vcodec_init_enc_pm only operate for the > > > > > clocks, > > > > > rename it from the _pm to _clk. > > > > > > > > > > No functional change. > > > > > > > > > > CC: Tiffany Lin <tiffany.lin@mediatek.com> > > > > > CC: Irui Wang <irui.wang@mediatek.com> > > > > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > > > > > > > Reviewed-by: AngeloGioacchino Del Regno < > > > > angelogioacchino.delregno@collabora.com> > > > > > > > > > > Hello Yong, > > > the mtk-vcodec patches were merged in Yunfei's vcodec patch > > > series and Hans has > > > scheduled that for v5.18. > > > > > > Can you please send a v10 and drop patches 10/15, 11/15, 12/15 > > > (all of the > > > media: mtk-vcodec: *) from this series? Hi Angelo, I have dropped 11/15 and 12/15 in v10 and rebase 10/15 on media tree manually, thus I didn't keep your A-y for that one. Please take a look at that one. Thanks. > > > > > > For the records, I think that after sending v10 this series is > > > ready to be merged, > > > as it was well reviewed and also tested on many MTK platforms. > > > > Good to know. When I have the v10 I'll try to prioritize reviewing > > it and running > > my usual tests. Hi Hans/Matthias, v10: https://patchwork.linuxtv.org/project/linux-media/list/?series=7130 Please help take a look that one. > > > > Yong, please make sure you run 'checkpatch.pl --strict' over the > > v10 patches and fix > > any issues (using common sense). Have run this on v10. Thanks. > > > > Can you please take me in the look when you take the patches. I'll > take the DTS > related as soon as you queue up the others. > > Thanks! > Matthias > > > Regards, > > > > Hans > > > > > > > > Thank you, > > > - Angelo
Hi Matthias, On 1/13/22 17:10, Matthias Brugger wrote: > Hi Hans, > > On 13/01/2022 11:15, Hans Verkuil wrote: >> On 13/01/2022 11:11, AngeloGioacchino Del Regno wrote: >>> Il 11/01/22 11:57, AngeloGioacchino Del Regno ha scritto: >>>> Il 12/11/21 11:55, Yong Wu ha scritto: >>>>> After this patchset, mtk_vcodec_release_enc_pm has only one line. >>>>> then remove that function, use pm_runtime_disable instead. >>>>> >>>>> meanwhile, mtk_vcodec_init_enc_pm only operate for the clocks, >>>>> rename it from the _pm to _clk. >>>>> >>>>> No functional change. >>>>> >>>>> CC: Tiffany Lin <tiffany.lin@mediatek.com> >>>>> CC: Irui Wang <irui.wang@mediatek.com> >>>>> Signed-off-by: Yong Wu <yong.wu@mediatek.com> >>>> >>>> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >>>> >>> >>> Hello Yong, >>> the mtk-vcodec patches were merged in Yunfei's vcodec patch series and Hans has >>> scheduled that for v5.18. >>> >>> Can you please send a v10 and drop patches 10/15, 11/15, 12/15 (all of the >>> media: mtk-vcodec: *) from this series? >>> >>> For the records, I think that after sending v10 this series is ready to be merged, >>> as it was well reviewed and also tested on many MTK platforms. >> >> Good to know. When I have the v10 I'll try to prioritize reviewing it and running >> my usual tests. >> >> Yong, please make sure you run 'checkpatch.pl --strict' over the v10 patches and fix >> any issues (using common sense). >> > > Can you please take me in the look when you take the patches. I'll take the DTS related as soon as you queue up the others. This just got merged into our tree. Regards, Hans
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c index 45d1870c83dd..136798051f21 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c @@ -272,7 +272,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) return PTR_ERR(dev->fw_handler); dev->venc_pdata = of_device_get_match_data(&pdev->dev); - ret = mtk_vcodec_init_enc_pm(dev); + ret = mtk_vcodec_init_enc_clk(dev); if (ret < 0) { dev_err(&pdev->dev, "Failed to get mtk vcodec clock source!"); goto err_enc_pm; @@ -384,7 +384,7 @@ static int mtk_vcodec_probe(struct platform_device *pdev) err_enc_alloc: v4l2_device_unregister(&dev->v4l2_dev); err_res: - mtk_vcodec_release_enc_pm(dev); + pm_runtime_disable(&pdev->dev); err_enc_pm: mtk_vcodec_fw_release(dev->fw_handler); return ret; @@ -463,7 +463,7 @@ static int mtk_vcodec_enc_remove(struct platform_device *pdev) video_unregister_device(dev->vfd_enc); v4l2_device_unregister(&dev->v4l2_dev); - mtk_vcodec_release_enc_pm(dev); + pm_runtime_disable(&pdev->dev); mtk_vcodec_fw_release(dev->fw_handler); return 0; } diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c index dffb190267ed..12637908e5f6 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c @@ -12,7 +12,7 @@ #include "mtk_vcodec_enc_pm.h" #include "mtk_vcodec_util.h" -int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) +int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *mtkdev) { struct platform_device *pdev; struct mtk_vcodec_pm *pm; @@ -60,12 +60,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) return 0; } -void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *mtkdev) -{ - pm_runtime_disable(mtkdev->pm.dev); -} - - void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm) { struct mtk_vcodec_clk *enc_clk = &pm->venc_clk; diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h index b7ecdfd74823..bc455cefc0cd 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h @@ -9,8 +9,7 @@ #include "mtk_vcodec_drv.h" -int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *dev); -void mtk_vcodec_release_enc_pm(struct mtk_vcodec_dev *dev); +int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *dev); void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm); void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm);
After this patchset, mtk_vcodec_release_enc_pm has only one line. then remove that function, use pm_runtime_disable instead. meanwhile, mtk_vcodec_init_enc_pm only operate for the clocks, rename it from the _pm to _clk. No functional change. CC: Tiffany Lin <tiffany.lin@mediatek.com> CC: Irui Wang <irui.wang@mediatek.com> Signed-off-by: Yong Wu <yong.wu@mediatek.com> --- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 6 +++--- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 8 +------- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h | 3 +-- 3 files changed, 5 insertions(+), 12 deletions(-)