From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
To: dri-devel@lists.freedesktop.org, alyssa@rosenzweig.io,
steven.price@arm.com, tomeu.vizoso@collabora.com,
robh@kernel.org
Cc: linux-kernel@vger.kernel.org, daniel@ffwll.ch, airlied@linux.ie,
robin.murphy@arm.com, linux-amlogic@lists.infradead.org,
linux-rockchip@lists.infradead.org,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Subject: [PATCH RFT v1 3/3] drm/panfrost: Use the mali-supply regulator for control again
Date: Wed, 8 Jan 2020 00:06:26 +0100 [thread overview]
Message-ID: <20200107230626.885451-4-martin.blumenstingl@googlemail.com> (raw)
In-Reply-To: <20200107230626.885451-1-martin.blumenstingl@googlemail.com>
dev_pm_opp_set_rate() needs a reference to the regulator which should be
updated when updating the GPU frequency. The name of the regulator has
to be passed at initialization-time using dev_pm_opp_set_regulators().
Add the call to dev_pm_opp_set_regulators() so dev_pm_opp_set_rate()
will update the GPU regulator when updating the frequency (just like
we did this manually before when we open-coded dev_pm_opp_set_rate()).
Fixes: 221bc77914cbcc ("drm/panfrost: Use generic code for devfreq")
Reported-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 22 ++++++++++++++++++++-
drivers/gpu/drm/panfrost/panfrost_device.h | 1 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index 170f6c8c9651..4f7999c7b44c 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -74,6 +74,7 @@ static struct devfreq_dev_profile panfrost_devfreq_profile = {
int panfrost_devfreq_init(struct panfrost_device *pfdev)
{
int ret;
+ struct opp_table *opp_table;
struct dev_pm_opp *opp;
unsigned long cur_freq;
struct device *dev = &pfdev->pdev->dev;
@@ -84,9 +85,24 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
/* Optional, continue without devfreq */
return 0;
+ opp_table = dev_pm_opp_set_regulators(dev,
+ (const char *[]){ "mali" },
+ 1);
+ if (IS_ERR(opp_table)) {
+ ret = PTR_ERR(opp_table);
+
+ /* Continue if the optional regulator is missing */
+ if (ret != -ENODEV)
+ return ret;
+ } else {
+ pfdev->devfreq.regulators_opp_table = opp_table;
+ }
+
ret = dev_pm_opp_of_add_table(dev);
- if (ret)
+ if (ret) {
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return ret;
+ }
panfrost_devfreq_reset(pfdev);
@@ -95,6 +111,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
opp = devfreq_recommended_opp(dev, &cur_freq, 0);
if (IS_ERR(opp)) {
dev_pm_opp_of_remove_table(dev);
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return PTR_ERR(opp);
}
@@ -106,6 +123,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
if (IS_ERR(devfreq)) {
DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");
dev_pm_opp_of_remove_table(dev);
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return PTR_ERR(devfreq);
}
pfdev->devfreq.devfreq = devfreq;
@@ -124,6 +142,8 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev)
if (pfdev->devfreq.cooling)
devfreq_cooling_unregister(pfdev->devfreq.cooling);
dev_pm_opp_of_remove_table(&pfdev->pdev->dev);
+ if (pfdev->devfreq.regulators_opp_table)
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
}
void panfrost_devfreq_resume(struct panfrost_device *pfdev)
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h
index 06713811b92c..4878b239e301 100644
--- a/drivers/gpu/drm/panfrost/panfrost_device.h
+++ b/drivers/gpu/drm/panfrost/panfrost_device.h
@@ -85,6 +85,7 @@ struct panfrost_device {
struct {
struct devfreq *devfreq;
+ struct opp_table *regulators_opp_table;
struct thermal_cooling_device *cooling;
ktime_t busy_time;
ktime_t idle_time;
--
2.24.1
WARNING: multiple messages have this Message-ID (diff)
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
To: dri-devel@lists.freedesktop.org, alyssa@rosenzweig.io,
steven.price@arm.com, tomeu.vizoso@collabora.com,
robh@kernel.org
Cc: airlied@linux.ie, linux-kernel@vger.kernel.org,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-rockchip@lists.infradead.org,
linux-amlogic@lists.infradead.org, robin.murphy@arm.com
Subject: [PATCH RFT v1 3/3] drm/panfrost: Use the mali-supply regulator for control again
Date: Wed, 8 Jan 2020 00:06:26 +0100 [thread overview]
Message-ID: <20200107230626.885451-4-martin.blumenstingl@googlemail.com> (raw)
In-Reply-To: <20200107230626.885451-1-martin.blumenstingl@googlemail.com>
dev_pm_opp_set_rate() needs a reference to the regulator which should be
updated when updating the GPU frequency. The name of the regulator has
to be passed at initialization-time using dev_pm_opp_set_regulators().
Add the call to dev_pm_opp_set_regulators() so dev_pm_opp_set_rate()
will update the GPU regulator when updating the frequency (just like
we did this manually before when we open-coded dev_pm_opp_set_rate()).
Fixes: 221bc77914cbcc ("drm/panfrost: Use generic code for devfreq")
Reported-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 22 ++++++++++++++++++++-
drivers/gpu/drm/panfrost/panfrost_device.h | 1 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index 170f6c8c9651..4f7999c7b44c 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -74,6 +74,7 @@ static struct devfreq_dev_profile panfrost_devfreq_profile = {
int panfrost_devfreq_init(struct panfrost_device *pfdev)
{
int ret;
+ struct opp_table *opp_table;
struct dev_pm_opp *opp;
unsigned long cur_freq;
struct device *dev = &pfdev->pdev->dev;
@@ -84,9 +85,24 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
/* Optional, continue without devfreq */
return 0;
+ opp_table = dev_pm_opp_set_regulators(dev,
+ (const char *[]){ "mali" },
+ 1);
+ if (IS_ERR(opp_table)) {
+ ret = PTR_ERR(opp_table);
+
+ /* Continue if the optional regulator is missing */
+ if (ret != -ENODEV)
+ return ret;
+ } else {
+ pfdev->devfreq.regulators_opp_table = opp_table;
+ }
+
ret = dev_pm_opp_of_add_table(dev);
- if (ret)
+ if (ret) {
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return ret;
+ }
panfrost_devfreq_reset(pfdev);
@@ -95,6 +111,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
opp = devfreq_recommended_opp(dev, &cur_freq, 0);
if (IS_ERR(opp)) {
dev_pm_opp_of_remove_table(dev);
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return PTR_ERR(opp);
}
@@ -106,6 +123,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
if (IS_ERR(devfreq)) {
DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");
dev_pm_opp_of_remove_table(dev);
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return PTR_ERR(devfreq);
}
pfdev->devfreq.devfreq = devfreq;
@@ -124,6 +142,8 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev)
if (pfdev->devfreq.cooling)
devfreq_cooling_unregister(pfdev->devfreq.cooling);
dev_pm_opp_of_remove_table(&pfdev->pdev->dev);
+ if (pfdev->devfreq.regulators_opp_table)
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
}
void panfrost_devfreq_resume(struct panfrost_device *pfdev)
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h
index 06713811b92c..4878b239e301 100644
--- a/drivers/gpu/drm/panfrost/panfrost_device.h
+++ b/drivers/gpu/drm/panfrost/panfrost_device.h
@@ -85,6 +85,7 @@ struct panfrost_device {
struct {
struct devfreq *devfreq;
+ struct opp_table *regulators_opp_table;
struct thermal_cooling_device *cooling;
ktime_t busy_time;
ktime_t idle_time;
--
2.24.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
To: dri-devel@lists.freedesktop.org, alyssa@rosenzweig.io,
steven.price@arm.com, tomeu.vizoso@collabora.com,
robh@kernel.org
Cc: airlied@linux.ie, linux-kernel@vger.kernel.org,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-rockchip@lists.infradead.org, daniel@ffwll.ch,
linux-amlogic@lists.infradead.org, robin.murphy@arm.com
Subject: [PATCH RFT v1 3/3] drm/panfrost: Use the mali-supply regulator for control again
Date: Wed, 8 Jan 2020 00:06:26 +0100 [thread overview]
Message-ID: <20200107230626.885451-4-martin.blumenstingl@googlemail.com> (raw)
In-Reply-To: <20200107230626.885451-1-martin.blumenstingl@googlemail.com>
dev_pm_opp_set_rate() needs a reference to the regulator which should be
updated when updating the GPU frequency. The name of the regulator has
to be passed at initialization-time using dev_pm_opp_set_regulators().
Add the call to dev_pm_opp_set_regulators() so dev_pm_opp_set_rate()
will update the GPU regulator when updating the frequency (just like
we did this manually before when we open-coded dev_pm_opp_set_rate()).
Fixes: 221bc77914cbcc ("drm/panfrost: Use generic code for devfreq")
Reported-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 22 ++++++++++++++++++++-
drivers/gpu/drm/panfrost/panfrost_device.h | 1 +
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index 170f6c8c9651..4f7999c7b44c 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -74,6 +74,7 @@ static struct devfreq_dev_profile panfrost_devfreq_profile = {
int panfrost_devfreq_init(struct panfrost_device *pfdev)
{
int ret;
+ struct opp_table *opp_table;
struct dev_pm_opp *opp;
unsigned long cur_freq;
struct device *dev = &pfdev->pdev->dev;
@@ -84,9 +85,24 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
/* Optional, continue without devfreq */
return 0;
+ opp_table = dev_pm_opp_set_regulators(dev,
+ (const char *[]){ "mali" },
+ 1);
+ if (IS_ERR(opp_table)) {
+ ret = PTR_ERR(opp_table);
+
+ /* Continue if the optional regulator is missing */
+ if (ret != -ENODEV)
+ return ret;
+ } else {
+ pfdev->devfreq.regulators_opp_table = opp_table;
+ }
+
ret = dev_pm_opp_of_add_table(dev);
- if (ret)
+ if (ret) {
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return ret;
+ }
panfrost_devfreq_reset(pfdev);
@@ -95,6 +111,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
opp = devfreq_recommended_opp(dev, &cur_freq, 0);
if (IS_ERR(opp)) {
dev_pm_opp_of_remove_table(dev);
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return PTR_ERR(opp);
}
@@ -106,6 +123,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
if (IS_ERR(devfreq)) {
DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");
dev_pm_opp_of_remove_table(dev);
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
return PTR_ERR(devfreq);
}
pfdev->devfreq.devfreq = devfreq;
@@ -124,6 +142,8 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev)
if (pfdev->devfreq.cooling)
devfreq_cooling_unregister(pfdev->devfreq.cooling);
dev_pm_opp_of_remove_table(&pfdev->pdev->dev);
+ if (pfdev->devfreq.regulators_opp_table)
+ dev_pm_opp_put_regulators(pfdev->devfreq.regulators_opp_table);
}
void panfrost_devfreq_resume(struct panfrost_device *pfdev)
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h
index 06713811b92c..4878b239e301 100644
--- a/drivers/gpu/drm/panfrost/panfrost_device.h
+++ b/drivers/gpu/drm/panfrost/panfrost_device.h
@@ -85,6 +85,7 @@ struct panfrost_device {
struct {
struct devfreq *devfreq;
+ struct opp_table *regulators_opp_table;
struct thermal_cooling_device *cooling;
ktime_t busy_time;
ktime_t idle_time;
--
2.24.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2020-01-07 23:06 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 23:06 [PATCH RFT v1 0/3] devfreq fixes for panfrost Martin Blumenstingl
2020-01-07 23:06 ` Martin Blumenstingl
2020-01-07 23:06 ` Martin Blumenstingl
2020-01-07 23:06 ` [PATCH RFT v1 1/3] drm/panfrost: enable devfreq based the "operating-points-v2" property Martin Blumenstingl
2020-01-07 23:06 ` Martin Blumenstingl
2020-01-07 23:06 ` Martin Blumenstingl
2020-01-08 11:18 ` Robin Murphy
2020-01-08 11:18 ` Robin Murphy
2020-01-08 11:18 ` Robin Murphy
2020-01-08 12:38 ` Martin Blumenstingl
2020-01-08 12:38 ` Martin Blumenstingl
2020-01-08 12:38 ` Martin Blumenstingl
2020-01-08 14:20 ` Robin Murphy
2020-01-08 14:20 ` Robin Murphy
2020-01-08 14:20 ` Robin Murphy
2020-01-07 23:06 ` [PATCH RFT v1 2/3] drm/panfrost: call dev_pm_opp_of_remove_table() in all error-paths Martin Blumenstingl
2020-01-07 23:06 ` Martin Blumenstingl
2020-01-07 23:06 ` Martin Blumenstingl
2020-01-09 11:31 ` Steven Price
2020-01-09 11:31 ` Steven Price
2020-01-09 11:31 ` Steven Price
2020-01-07 23:06 ` Martin Blumenstingl [this message]
2020-01-07 23:06 ` [PATCH RFT v1 3/3] drm/panfrost: Use the mali-supply regulator for control again Martin Blumenstingl
2020-01-07 23:06 ` Martin Blumenstingl
2020-01-09 11:31 ` Steven Price
2020-01-09 11:31 ` Steven Price
2020-01-09 11:31 ` Steven Price
2020-01-09 11:31 ` Steven Price
2020-01-09 17:27 ` Martin Blumenstingl
2020-01-09 17:27 ` Martin Blumenstingl
2020-01-09 17:27 ` Martin Blumenstingl
2020-01-13 17:10 ` Steven Price
2020-01-13 17:10 ` Steven Price
2020-01-13 17:10 ` Steven Price
2020-01-14 20:21 ` Martin Blumenstingl
2020-01-14 20:21 ` Martin Blumenstingl
2020-01-14 20:21 ` Martin Blumenstingl
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=20200107230626.885451-4-martin.blumenstingl@googlemail.com \
--to=martin.blumenstingl@googlemail.com \
--cc=airlied@linux.ie \
--cc=alyssa@rosenzweig.io \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robh@kernel.org \
--cc=robin.murphy@arm.com \
--cc=steven.price@arm.com \
--cc=tomeu.vizoso@collabora.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.