Re: [PATCH v3 08/14] drm/panfrost: move devfreq_init()/fini() in device

[Steven Price]

On 09/07/2020 15:03, 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.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzw...@collabora.com>
Signed-off-by: Clément Péron <peron.c...@gmail.com>

Reviewed-by: Steven Price <steven.pr...@arm.com>

---
  drivers/gpu/drm/panfrost/panfrost_device.c | 12 +++++++++++-
  drivers/gpu/drm/panfrost/panfrost_drv.c    | 15 ++-------------
  2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c 
b/drivers/gpu/drm/panfrost/panfrost_device.c
index cc16d102b275..464da1646398 100644
--- a/drivers/gpu/drm/panfrost/panfrost_device.c
+++ b/drivers/gpu/drm/panfrost/panfrost_device.c
@@ -212,10 +212,17 @@ int panfrost_device_init(struct panfrost_device *pfdev)
                return err;
        }

+ err = panfrost_devfreq_init(pfdev);

+       if (err) {
+               if (err != -EPROBE_DEFER)
+                       dev_err(pfdev->dev, "devfreq init failed %d\n", err);
+               goto out_clk;
+       }
+
        err = panfrost_regulator_init(pfdev);
        if (err) {
                dev_err(pfdev->dev, "regulator init failed %d\n", err);
-               goto out_clk;
+               goto out_devfreq;
        }

err = panfrost_reset_init(pfdev);

@@ -265,6 +272,8 @@ int panfrost_device_init(struct panfrost_device *pfdev)
        panfrost_reset_fini(pfdev);
  out_regulator:
        panfrost_regulator_fini(pfdev);
+out_devfreq:
+       panfrost_devfreq_fini(pfdev);
  out_clk:
        panfrost_clk_fini(pfdev);
        return err;
@@ -278,6 +287,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);

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel