| Message ID | 20200510165538.19720-9-peron.clem@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add regulator devfreq support to Panfrost | expand |
On 10/05/2020 17:55, Clément Péron wrote: > Later we will introduce devfreq probing regulator if they > are present. As regulator should be probe only one time we > need to get this logic in the device_init(). > > panfrost_device is already taking care of devfreq_resume() > and devfreq_suspend(), so it's not totally illogic to move > the devfreq_init() and devfreq_fini() here. > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > --- > drivers/gpu/drm/panfrost/panfrost_device.c | 37 ++++++++++++++-------- > drivers/gpu/drm/panfrost/panfrost_drv.c | 15 ++------- > 2 files changed, 25 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c > index 8136babd3ba9..f480127205d6 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_device.c > +++ b/drivers/gpu/drm/panfrost/panfrost_device.c > @@ -212,59 +212,67 @@ int panfrost_device_init(struct panfrost_device *pfdev) > return err; > } > > + err = panfrost_devfreq_init(pfdev); > + if (err) { > + dev_err(pfdev->dev, "devfreq init failed %d\n", err); > + goto err_out0; > + } > + > err = panfrost_regulator_init(pfdev); > if (err) { > dev_err(pfdev->dev, "regulator init failed %d\n", err); > - goto err_out0; > + goto err_out1; NIT: Rather than just renumbering these can we give them sensible names so we don't have this sort of refactoring in future? > } > > err = panfrost_reset_init(pfdev); > if (err) { > dev_err(pfdev->dev, "reset init failed %d\n", err); > - goto err_out1; > + goto err_out2; > } > > err = panfrost_pm_domain_init(pfdev); > if (err) > - goto err_out2; > + goto err_out3; > > res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); > pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); > if (IS_ERR(pfdev->iomem)) { > dev_err(pfdev->dev, "failed to ioremap iomem\n"); > err = PTR_ERR(pfdev->iomem); > - goto err_out3; > + goto err_out4; > } > > err = panfrost_gpu_init(pfdev); > if (err) > - goto err_out3; > + goto err_out4; > > err = panfrost_mmu_init(pfdev); > if (err) > - goto err_out4; > + goto err_out5; > > err = panfrost_job_init(pfdev); > if (err) > - goto err_out5; > + goto err_out6; > > err = panfrost_perfcnt_init(pfdev); > if (err) > - goto err_out6; > + goto err_out7; > > return 0; > -err_out6: > +err_out7: > panfrost_job_fini(pfdev); > -err_out5: > +err_out6: > panfrost_mmu_fini(pfdev); > -err_out4: > +err_out5: > panfrost_gpu_fini(pfdev); > -err_out3: > +err_out4: > panfrost_pm_domain_fini(pfdev); > -err_out2: > +err_out3: > panfrost_reset_fini(pfdev); > -err_out1: > +err_out2: > panfrost_regulator_fini(pfdev); > +err_out1: > + panfrost_devfreq_fini(pfdev); > err_out0: > panfrost_clk_fini(pfdev); > return err; > @@ -278,6 +286,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) > panfrost_gpu_fini(pfdev); > panfrost_pm_domain_fini(pfdev); > panfrost_reset_fini(pfdev); > + panfrost_devfreq_fini(pfdev); > panfrost_regulator_fini(pfdev); > panfrost_clk_fini(pfdev); > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c > index 882fecc33fdb..4dda68689015 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -14,7 +14,6 @@ > #include <drm/drm_utils.h> > > #include "panfrost_device.h" > -#include "panfrost_devfreq.h" > #include "panfrost_gem.h" > #include "panfrost_mmu.h" > #include "panfrost_job.h" > @@ -606,13 +605,6 @@ static int panfrost_probe(struct platform_device *pdev) > goto err_out0; > } > > - err = panfrost_devfreq_init(pfdev); > - if (err) { > - if (err != -EPROBE_DEFER) > - dev_err(&pdev->dev, "Fatal error during devfreq init\n"); You seem to have lost the check for EPROBE_DEFER during the move. > - goto err_out1; > - } > - > pm_runtime_set_active(pfdev->dev); > pm_runtime_mark_last_busy(pfdev->dev); > pm_runtime_enable(pfdev->dev); > @@ -625,16 +617,14 @@ static int panfrost_probe(struct platform_device *pdev) > */ > err = drm_dev_register(ddev, 0); > if (err < 0) > - goto err_out2; > + goto err_out1; > > panfrost_gem_shrinker_init(ddev); > > return 0; > > -err_out2: > - pm_runtime_disable(pfdev->dev); > - panfrost_devfreq_fini(pfdev); > err_out1: > + pm_runtime_disable(pfdev->dev); > panfrost_device_fini(pfdev); > err_out0: > drm_dev_put(ddev); > @@ -650,7 +640,6 @@ static int panfrost_remove(struct platform_device *pdev) > panfrost_gem_shrinker_cleanup(ddev); > > pm_runtime_get_sync(pfdev->dev); > - panfrost_devfreq_fini(pfdev); > panfrost_device_fini(pfdev); > pm_runtime_put_sync_suspend(pfdev->dev); > pm_runtime_disable(pfdev->dev); >
Hi Steven On Thu, 28 May 2020 at 15:22, Steven Price <steven.price@arm.com> wrote: > > On 10/05/2020 17:55, Clément Péron wrote: > > Later we will introduce devfreq probing regulator if they > > are present. As regulator should be probe only one time we > > need to get this logic in the device_init(). > > > > panfrost_device is already taking care of devfreq_resume() > > and devfreq_suspend(), so it's not totally illogic to move > > the devfreq_init() and devfreq_fini() here. > > > > Signed-off-by: Clément Péron <peron.clem@gmail.com> > > --- > > drivers/gpu/drm/panfrost/panfrost_device.c | 37 ++++++++++++++-------- > > drivers/gpu/drm/panfrost/panfrost_drv.c | 15 ++------- > > 2 files changed, 25 insertions(+), 27 deletions(-) > > > > diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c > > index 8136babd3ba9..f480127205d6 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_device.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_device.c > > @@ -212,59 +212,67 @@ int panfrost_device_init(struct panfrost_device *pfdev) > > return err; > > } > > > > + err = panfrost_devfreq_init(pfdev); > > + if (err) { > > + dev_err(pfdev->dev, "devfreq init failed %d\n", err); > > + goto err_out0; > > + } > > + > > err = panfrost_regulator_init(pfdev); > > if (err) { > > dev_err(pfdev->dev, "regulator init failed %d\n", err); > > - goto err_out0; > > + goto err_out1; > > NIT: Rather than just renumbering these can we give them sensible names > so we don't have this sort of refactoring in future? Agree, I will change that in v2 > > > } > > > > err = panfrost_reset_init(pfdev); > > if (err) { > > dev_err(pfdev->dev, "reset init failed %d\n", err); > > - goto err_out1; > > + goto err_out2; > > } > > > > err = panfrost_pm_domain_init(pfdev); > > if (err) > > - goto err_out2; > > + goto err_out3; > > > > res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); > > pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); > > if (IS_ERR(pfdev->iomem)) { > > dev_err(pfdev->dev, "failed to ioremap iomem\n"); > > err = PTR_ERR(pfdev->iomem); > > - goto err_out3; > > + goto err_out4; > > } > > > > err = panfrost_gpu_init(pfdev); > > if (err) > > - goto err_out3; > > + goto err_out4; > > > > err = panfrost_mmu_init(pfdev); > > if (err) > > - goto err_out4; > > + goto err_out5; > > > > err = panfrost_job_init(pfdev); > > if (err) > > - goto err_out5; > > + goto err_out6; > > > > err = panfrost_perfcnt_init(pfdev); > > if (err) > > - goto err_out6; > > + goto err_out7; > > > > return 0; > > -err_out6: > > +err_out7: > > panfrost_job_fini(pfdev); > > -err_out5: > > +err_out6: > > panfrost_mmu_fini(pfdev); > > -err_out4: > > +err_out5: > > panfrost_gpu_fini(pfdev); > > -err_out3: > > +err_out4: > > panfrost_pm_domain_fini(pfdev); > > -err_out2: > > +err_out3: > > panfrost_reset_fini(pfdev); > > -err_out1: > > +err_out2: > > panfrost_regulator_fini(pfdev); > > +err_out1: > > + panfrost_devfreq_fini(pfdev); > > err_out0: > > panfrost_clk_fini(pfdev); > > return err; > > @@ -278,6 +286,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) > > panfrost_gpu_fini(pfdev); > > panfrost_pm_domain_fini(pfdev); > > panfrost_reset_fini(pfdev); > > + panfrost_devfreq_fini(pfdev); > > panfrost_regulator_fini(pfdev); > > panfrost_clk_fini(pfdev); > > } > > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c > > index 882fecc33fdb..4dda68689015 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > > @@ -14,7 +14,6 @@ > > #include <drm/drm_utils.h> > > > > #include "panfrost_device.h" > > -#include "panfrost_devfreq.h" > > #include "panfrost_gem.h" > > #include "panfrost_mmu.h" > > #include "panfrost_job.h" > > @@ -606,13 +605,6 @@ static int panfrost_probe(struct platform_device *pdev) > > goto err_out0; > > } > > > > - err = panfrost_devfreq_init(pfdev); > > - if (err) { > > - if (err != -EPROBE_DEFER) > > - dev_err(&pdev->dev, "Fatal error during devfreq init\n"); > > You seem to have lost the check for EPROBE_DEFER during the move. Correct, sorry for that, I will fix it in v2. Thanks for your review, Clement > > > - goto err_out1; > > - } > > - > > pm_runtime_set_active(pfdev->dev); > > pm_runtime_mark_last_busy(pfdev->dev); > > pm_runtime_enable(pfdev->dev); > > @@ -625,16 +617,14 @@ static int panfrost_probe(struct platform_device *pdev) > > */ > > err = drm_dev_register(ddev, 0); > > if (err < 0) > > - goto err_out2; > > + goto err_out1; > > > > panfrost_gem_shrinker_init(ddev); > > > > return 0; > > > > -err_out2: > > - pm_runtime_disable(pfdev->dev); > > - panfrost_devfreq_fini(pfdev); > > err_out1: > > + pm_runtime_disable(pfdev->dev); > > panfrost_device_fini(pfdev); > > err_out0: > > drm_dev_put(ddev); > > @@ -650,7 +640,6 @@ static int panfrost_remove(struct platform_device *pdev) > > panfrost_gem_shrinker_cleanup(ddev); > > > > pm_runtime_get_sync(pfdev->dev); > > - panfrost_devfreq_fini(pfdev); > > panfrost_device_fini(pfdev); > > pm_runtime_put_sync_suspend(pfdev->dev); > > pm_runtime_disable(pfdev->dev); > > >
On 5/29/20 2:38 PM, Clément Péron wrote: > Hi Steven > > On Thu, 28 May 2020 at 15:22, Steven Price <steven.price@arm.com> wrote: >> >> On 10/05/2020 17:55, Clément Péron wrote: >>> Later we will introduce devfreq probing regulator if they >>> are present. As regulator should be probe only one time we >>> need to get this logic in the device_init(). >>> >>> panfrost_device is already taking care of devfreq_resume() >>> and devfreq_suspend(), so it's not totally illogic to move >>> the devfreq_init() and devfreq_fini() here. >>> >>> Signed-off-by: Clément Péron <peron.clem@gmail.com> >>> --- >>> drivers/gpu/drm/panfrost/panfrost_device.c | 37 ++++++++++++++-------- >>> drivers/gpu/drm/panfrost/panfrost_drv.c | 15 ++------- >>> 2 files changed, 25 insertions(+), 27 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c >>> index 8136babd3ba9..f480127205d6 100644 >>> --- a/drivers/gpu/drm/panfrost/panfrost_device.c >>> +++ b/drivers/gpu/drm/panfrost/panfrost_device.c >>> @@ -212,59 +212,67 @@ int panfrost_device_init(struct panfrost_device *pfdev) >>> return err; >>> } >>> >>> + err = panfrost_devfreq_init(pfdev); >>> + if (err) { >>> + dev_err(pfdev->dev, "devfreq init failed %d\n", err); >>> + goto err_out0; >>> + } >>> + >>> err = panfrost_regulator_init(pfdev); >>> if (err) { >>> dev_err(pfdev->dev, "regulator init failed %d\n", err); >>> - goto err_out0; >>> + goto err_out1; >> >> NIT: Rather than just renumbering these can we give them sensible names >> so we don't have this sort of refactoring in future? > > Agree, I will change that in v2 FWIW, there's a sensible approach described in Documentation/process/coding-style.rst ("7) Centralized exiting of functions"). Regards, Tomeu > >> >>> } >>> >>> err = panfrost_reset_init(pfdev); >>> if (err) { >>> dev_err(pfdev->dev, "reset init failed %d\n", err); >>> - goto err_out1; >>> + goto err_out2; >>> } >>> >>> err = panfrost_pm_domain_init(pfdev); >>> if (err) >>> - goto err_out2; >>> + goto err_out3; >>> >>> res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); >>> pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); >>> if (IS_ERR(pfdev->iomem)) { >>> dev_err(pfdev->dev, "failed to ioremap iomem\n"); >>> err = PTR_ERR(pfdev->iomem); >>> - goto err_out3; >>> + goto err_out4; >>> } >>> >>> err = panfrost_gpu_init(pfdev); >>> if (err) >>> - goto err_out3; >>> + goto err_out4; >>> >>> err = panfrost_mmu_init(pfdev); >>> if (err) >>> - goto err_out4; >>> + goto err_out5; >>> >>> err = panfrost_job_init(pfdev); >>> if (err) >>> - goto err_out5; >>> + goto err_out6; >>> >>> err = panfrost_perfcnt_init(pfdev); >>> if (err) >>> - goto err_out6; >>> + goto err_out7; >>> >>> return 0; >>> -err_out6: >>> +err_out7: >>> panfrost_job_fini(pfdev); >>> -err_out5: >>> +err_out6: >>> panfrost_mmu_fini(pfdev); >>> -err_out4: >>> +err_out5: >>> panfrost_gpu_fini(pfdev); >>> -err_out3: >>> +err_out4: >>> panfrost_pm_domain_fini(pfdev); >>> -err_out2: >>> +err_out3: >>> panfrost_reset_fini(pfdev); >>> -err_out1: >>> +err_out2: >>> panfrost_regulator_fini(pfdev); >>> +err_out1: >>> + panfrost_devfreq_fini(pfdev); >>> err_out0: >>> panfrost_clk_fini(pfdev); >>> return err; >>> @@ -278,6 +286,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) >>> panfrost_gpu_fini(pfdev); >>> panfrost_pm_domain_fini(pfdev); >>> panfrost_reset_fini(pfdev); >>> + panfrost_devfreq_fini(pfdev); >>> panfrost_regulator_fini(pfdev); >>> panfrost_clk_fini(pfdev); >>> } >>> diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c >>> index 882fecc33fdb..4dda68689015 100644 >>> --- a/drivers/gpu/drm/panfrost/panfrost_drv.c >>> +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c >>> @@ -14,7 +14,6 @@ >>> #include <drm/drm_utils.h> >>> >>> #include "panfrost_device.h" >>> -#include "panfrost_devfreq.h" >>> #include "panfrost_gem.h" >>> #include "panfrost_mmu.h" >>> #include "panfrost_job.h" >>> @@ -606,13 +605,6 @@ static int panfrost_probe(struct platform_device *pdev) >>> goto err_out0; >>> } >>> >>> - err = panfrost_devfreq_init(pfdev); >>> - if (err) { >>> - if (err != -EPROBE_DEFER) >>> - dev_err(&pdev->dev, "Fatal error during devfreq init\n"); >> >> You seem to have lost the check for EPROBE_DEFER during the move. > > Correct, sorry for that, I will fix it in v2. > > Thanks for your review, > Clement > >> >>> - goto err_out1; >>> - } >>> - >>> pm_runtime_set_active(pfdev->dev); >>> pm_runtime_mark_last_busy(pfdev->dev); >>> pm_runtime_enable(pfdev->dev); >>> @@ -625,16 +617,14 @@ static int panfrost_probe(struct platform_device *pdev) >>> */ >>> err = drm_dev_register(ddev, 0); >>> if (err < 0) >>> - goto err_out2; >>> + goto err_out1; >>> >>> panfrost_gem_shrinker_init(ddev); >>> >>> return 0; >>> >>> -err_out2: >>> - pm_runtime_disable(pfdev->dev); >>> - panfrost_devfreq_fini(pfdev); >>> err_out1: >>> + pm_runtime_disable(pfdev->dev); >>> panfrost_device_fini(pfdev); >>> err_out0: >>> drm_dev_put(ddev); >>> @@ -650,7 +640,6 @@ static int panfrost_remove(struct platform_device *pdev) >>> panfrost_gem_shrinker_cleanup(ddev); >>> >>> pm_runtime_get_sync(pfdev->dev); >>> - panfrost_devfreq_fini(pfdev); >>> panfrost_device_fini(pfdev); >>> pm_runtime_put_sync_suspend(pfdev->dev); >>> pm_runtime_disable(pfdev->dev); >>> >>
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index 8136babd3ba9..f480127205d6 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -212,59 +212,67 @@ int panfrost_device_init(struct panfrost_device *pfdev) return err; } + err = panfrost_devfreq_init(pfdev); + if (err) { + dev_err(pfdev->dev, "devfreq init failed %d\n", err); + goto err_out0; + } + err = panfrost_regulator_init(pfdev); if (err) { dev_err(pfdev->dev, "regulator init failed %d\n", err); - goto err_out0; + goto err_out1; } err = panfrost_reset_init(pfdev); if (err) { dev_err(pfdev->dev, "reset init failed %d\n", err); - goto err_out1; + goto err_out2; } err = panfrost_pm_domain_init(pfdev); if (err) - goto err_out2; + goto err_out3; res = platform_get_resource(pfdev->pdev, IORESOURCE_MEM, 0); pfdev->iomem = devm_ioremap_resource(pfdev->dev, res); if (IS_ERR(pfdev->iomem)) { dev_err(pfdev->dev, "failed to ioremap iomem\n"); err = PTR_ERR(pfdev->iomem); - goto err_out3; + goto err_out4; } err = panfrost_gpu_init(pfdev); if (err) - goto err_out3; + goto err_out4; err = panfrost_mmu_init(pfdev); if (err) - goto err_out4; + goto err_out5; err = panfrost_job_init(pfdev); if (err) - goto err_out5; + goto err_out6; err = panfrost_perfcnt_init(pfdev); if (err) - goto err_out6; + goto err_out7; return 0; -err_out6: +err_out7: panfrost_job_fini(pfdev); -err_out5: +err_out6: panfrost_mmu_fini(pfdev); -err_out4: +err_out5: panfrost_gpu_fini(pfdev); -err_out3: +err_out4: panfrost_pm_domain_fini(pfdev); -err_out2: +err_out3: panfrost_reset_fini(pfdev); -err_out1: +err_out2: panfrost_regulator_fini(pfdev); +err_out1: + panfrost_devfreq_fini(pfdev); err_out0: panfrost_clk_fini(pfdev); return err; @@ -278,6 +286,7 @@ void panfrost_device_fini(struct panfrost_device *pfdev) panfrost_gpu_fini(pfdev); panfrost_pm_domain_fini(pfdev); panfrost_reset_fini(pfdev); + panfrost_devfreq_fini(pfdev); panfrost_regulator_fini(pfdev); panfrost_clk_fini(pfdev); } diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 882fecc33fdb..4dda68689015 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -14,7 +14,6 @@ #include <drm/drm_utils.h> #include "panfrost_device.h" -#include "panfrost_devfreq.h" #include "panfrost_gem.h" #include "panfrost_mmu.h" #include "panfrost_job.h" @@ -606,13 +605,6 @@ static int panfrost_probe(struct platform_device *pdev) goto err_out0; } - err = panfrost_devfreq_init(pfdev); - if (err) { - if (err != -EPROBE_DEFER) - dev_err(&pdev->dev, "Fatal error during devfreq init\n"); - goto err_out1; - } - pm_runtime_set_active(pfdev->dev); pm_runtime_mark_last_busy(pfdev->dev); pm_runtime_enable(pfdev->dev); @@ -625,16 +617,14 @@ static int panfrost_probe(struct platform_device *pdev) */ err = drm_dev_register(ddev, 0); if (err < 0) - goto err_out2; + goto err_out1; panfrost_gem_shrinker_init(ddev); return 0; -err_out2: - pm_runtime_disable(pfdev->dev); - panfrost_devfreq_fini(pfdev); err_out1: + pm_runtime_disable(pfdev->dev); panfrost_device_fini(pfdev); err_out0: drm_dev_put(ddev); @@ -650,7 +640,6 @@ static int panfrost_remove(struct platform_device *pdev) panfrost_gem_shrinker_cleanup(ddev); pm_runtime_get_sync(pfdev->dev); - panfrost_devfreq_fini(pfdev); panfrost_device_fini(pfdev); pm_runtime_put_sync_suspend(pfdev->dev); pm_runtime_disable(pfdev->dev);
Later we will introduce devfreq probing regulator if they are present. As regulator should be probe only one time we need to get this logic in the device_init(). panfrost_device is already taking care of devfreq_resume() and devfreq_suspend(), so it's not totally illogic to move the devfreq_init() and devfreq_fini() here. Signed-off-by: Clément Péron <peron.clem@gmail.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 37 ++++++++++++++-------- drivers/gpu/drm/panfrost/panfrost_drv.c | 15 ++------- 2 files changed, 25 insertions(+), 27 deletions(-)