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 10/15] drm/panfrost: add regulators to devfreq
Date: Thu, 28 May 2020 14:23:00 +0100 [thread overview]
Message-ID: <2f0d2cd6-481c-26ce-fcef-ee5b4fdb249b@arm.com> (raw)
In-Reply-To: <20200510165538.19720-11-peron.clem@gmail.com>
On 10/05/2020 17:55, Clément Péron wrote:
> Some OPP tables specify voltage for each frequency. Devfreq can
> handle these regulators but they should be get only 1 time to avoid
> issue and know who is in charge.
>
> If OPP table is probe don't init regulator.
>
> Signed-off-by: Clément Péron <peron.clem@gmail.com>
This looks like it should work - thanks for doing this!
Reviewed-by: Steven Price <steven.price@arm.com>
> ---
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 19 +++++++++++++++++++
> drivers/gpu/drm/panfrost/panfrost_devfreq.h | 2 ++
> drivers/gpu/drm/panfrost/panfrost_device.c | 11 +++++++----
> 3 files changed, 28 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> index fce21c682414..9ffea0d4a087 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> @@ -93,6 +93,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> unsigned long cur_freq;
> struct device *dev = &pfdev->pdev->dev;
> struct devfreq *devfreq;
> + struct opp_table *opp_table;
> struct thermal_cooling_device *cooling;
> struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;
>
> @@ -102,6 +103,19 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
>
> spin_lock_init(&pfdevfreq->lock);
>
> + opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names,
> + pfdev->comp->num_supplies);
> + if (IS_ERR(opp_table)) {
> + ret = PTR_ERR(opp_table);
> + /* Continue if the optional regulator is missing */
> + if (ret != -ENODEV) {
> + DRM_DEV_ERROR(dev, "Couldn't set OPP regulators\n");
> + goto err_fini;
> + }
> + } else {
> + pfdevfreq->regulators_opp_table = opp_table;
> + }
> +
> ret = dev_pm_opp_of_add_table(dev);
> if (ret) {
> DRM_DEV_ERROR(dev, "Couldn't add OPP table\n");
> @@ -157,6 +171,11 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev)
> dev_pm_opp_of_remove_table(&pfdev->pdev->dev);
> pfdevfreq->opp_of_table_added = false;
> }
> +
> + if (pfdevfreq->regulators_opp_table) {
> + dev_pm_opp_put_regulators(pfdevfreq->regulators_opp_table);
> + pfdevfreq->regulators_opp_table = NULL;
> + }
> }
>
> void panfrost_devfreq_resume(struct panfrost_device *pfdev)
> diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.h b/drivers/gpu/drm/panfrost/panfrost_devfreq.h
> index add203cb00c2..347cde4786cf 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.h
> +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.h
> @@ -8,12 +8,14 @@
> #include <linux/ktime.h>
>
> struct devfreq;
> +struct opp_table;
> struct thermal_cooling_device;
>
> struct panfrost_device;
>
> struct panfrost_devfreq {
> struct devfreq *devfreq;
> + struct opp_table *regulators_opp_table;
> struct thermal_cooling_device *cooling;
> bool opp_of_table_added;
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c
> index 67eedf64e82d..8b17fb2e3369 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_device.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_device.c
> @@ -222,10 +222,13 @@ int panfrost_device_init(struct panfrost_device *pfdev)
> goto err_out0;
> }
>
> - err = panfrost_regulator_init(pfdev);
> - if (err) {
> - dev_err(pfdev->dev, "regulator init failed %d\n", err);
> - goto err_out1;
> + /* OPP will handle regulators */
> + if (!pfdev->pfdevfreq.opp_of_table_added) {
> + err = panfrost_regulator_init(pfdev);
> + if (err) {
> + dev_err(pfdev->dev, "regulator init failed %d\n", err);
> + goto err_out1;
> + }
> }
>
> err = panfrost_reset_init(pfdev);
>
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
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 [this message]
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=2f0d2cd6-481c-26ce-fcef-ee5b4fdb249b@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).