From: Steven Price <steven.price@arm.com>
To: "Clément Péron" <peron.clem@gmail.com>,
"Rob Herring" <robh@kernel.org>,
"Tomeu Vizoso" <tomeu.vizoso@collabora.com>,
"Alyssa Rosenzweig" <alyssa.rosenzweig@collabora.com>,
"Viresh Kumar" <vireshk@kernel.org>, "Nishanth Menon" <nm@ti.com>,
"Stephen Boyd" <sboyd@kernel.org>,
"Maxime Ripard" <mripard@kernel.org>,
"Chen-Yu Tsai" <wens@csie.org>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 08/15] drm/panfrost: move devfreq_init()/fini() in device
Date: Thu, 28 May 2020 14:22:55 +0100 [thread overview]
Message-ID: <3ca4dd51-d868-0d6a-d4ca-37af572190bd@arm.com> (raw)
In-Reply-To: <20200510165538.19720-9-peron.clem@gmail.com>
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);
>
next prev parent reply other threads:[~2020-05-28 13:23 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 16:55 [PATCH 00/15][RFC] Add regulator devfreq support to Panfrost Clément Péron
2020-05-10 16:55 ` [PATCH 01/15] drm/panfrost: avoid static declaration Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 02/15] drm/panfrost: clean headers in devfreq Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 03/15] drm/panfrost: don't use pfdevfreq.busy_count to know if hw is idle Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 04/15] drm/panfrost: introduce panfrost_devfreq struct Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 05/15] drm/panfrost: use spinlock instead of atomic Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-29 12:20 ` Robin Murphy
2020-05-29 12:35 ` Clément Péron
2020-05-29 12:47 ` Steven Price
2020-05-10 16:55 ` [PATCH 06/15] drm/panfrost: properly handle error in probe Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 07/15] drm/panfrost: use device_property_present to check for OPP Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-29 12:45 ` Clément Péron
2020-05-10 16:55 ` [PATCH 08/15] drm/panfrost: move devfreq_init()/fini() in device Clément Péron
2020-05-28 13:22 ` Steven Price [this message]
2020-05-29 12:38 ` Clément Péron
2020-06-08 11:55 ` Tomeu Vizoso
2020-05-10 16:55 ` [PATCH 09/15] drm/panfrost: dynamically alloc regulators Clément Péron
2020-05-28 13:22 ` Steven Price
2020-05-10 16:55 ` [PATCH 10/15] drm/panfrost: add regulators to devfreq Clément Péron
2020-05-28 13:23 ` Steven Price
2020-05-29 12:37 ` Clément Péron
2020-05-10 16:55 ` [PATCH 11/15] drm/panfrost: set devfreq clock name Clément Péron
2020-05-28 13:23 ` Steven Price
2020-05-29 12:35 ` Clément Péron
2020-05-10 16:55 ` [PATCH 12/15] arm64: defconfig: Enable devfreq cooling device Clément Péron
2020-05-10 16:55 ` [PATCH 13/15] arm64: dts: allwinner: h6: Add cooling map for GPU Clément Péron
2020-05-10 16:55 ` [PATCH 14/15] [DO NOT MERGE] arm64: dts: allwinner: h6: Add GPU OPP table Clément Péron
2020-05-10 16:55 ` [PATCH 15/15] [DO NOT MERGE] arm64: dts: allwinner: force GPU regulator to be always Clément Péron
2020-05-11 5:43 ` [PATCH 00/15][RFC] Add regulator devfreq support to Panfrost Tomeu Vizoso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3ca4dd51-d868-0d6a-d4ca-37af572190bd@arm.com \
--to=steven.price@arm.com \
--cc=alyssa.rosenzweig@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mripard@kernel.org \
--cc=nm@ti.com \
--cc=peron.clem@gmail.com \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=tomeu.vizoso@collabora.com \
--cc=vireshk@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).