* [PATCH v2] drm/panfrost: make devfreq optional again
@ 2019-06-05 15:02 Neil Armstrong
2019-06-05 18:50 ` Ezequiel Garcia
2019-06-10 15:32 ` Rob Herring
0 siblings, 2 replies; 3+ messages in thread
From: Neil Armstrong @ 2019-06-05 15:02 UTC (permalink / raw)
To: robh, tomeu.vizoso; +Cc: peron.clem, ezequiel, dri-devel, Neil Armstrong
Devfreq runtime usage was made mandatory, thus making panfrost fail to probe
on Amlogic S912 SoCs missing the "operating-points-v2" property.
Make it optional again, leaving PM_DEVFREQ selected by default.
Fixes: f3617b449d ("drm/panfrost: Select devfreq")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
Changes since v1:
- fixed else/if logic in panfrost_devfreq_init
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
index 29fcffdf2d57..db798532b0b6 100644
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
@@ -140,7 +140,9 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
return 0;
ret = dev_pm_opp_of_add_table(&pfdev->pdev->dev);
- if (ret)
+ if (ret == -ENODEV) /* Optional, continue without devfreq */
+ return 0;
+ else if (ret)
return ret;
panfrost_devfreq_reset(pfdev);
@@ -170,6 +172,9 @@ void panfrost_devfreq_resume(struct panfrost_device *pfdev)
{
int i;
+ if (!pfdev->devfreq.devfreq)
+ return;
+
panfrost_devfreq_reset(pfdev);
for (i = 0; i < NUM_JOB_SLOTS; i++)
pfdev->devfreq.slot[i].busy = false;
@@ -179,6 +184,9 @@ void panfrost_devfreq_resume(struct panfrost_device *pfdev)
void panfrost_devfreq_suspend(struct panfrost_device *pfdev)
{
+ if (!pfdev->devfreq.devfreq)
+ return;
+
devfreq_suspend_device(pfdev->devfreq.devfreq);
}
@@ -188,6 +196,9 @@ static void panfrost_devfreq_update_utilization(struct panfrost_device *pfdev, i
ktime_t now;
ktime_t last;
+ if (!pfdev->devfreq.devfreq)
+ return;
+
now = ktime_get();
last = pfdev->devfreq.slot[slot].time_last_update;
--
2.21.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm/panfrost: make devfreq optional again
2019-06-05 15:02 [PATCH v2] drm/panfrost: make devfreq optional again Neil Armstrong
@ 2019-06-05 18:50 ` Ezequiel Garcia
2019-06-10 15:32 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Ezequiel Garcia @ 2019-06-05 18:50 UTC (permalink / raw)
To: Neil Armstrong, robh, tomeu.vizoso; +Cc: peron.clem, dri-devel
On Wed, 2019-06-05 at 17:02 +0200, Neil Armstrong wrote:
> Devfreq runtime usage was made mandatory, thus making panfrost fail to probe
> on Amlogic S912 SoCs missing the "operating-points-v2" property.
> Make it optional again, leaving PM_DEVFREQ selected by default.
>
> Fixes: f3617b449d ("drm/panfrost: Select devfreq")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Thanks for the fix,
Eze
> ---
> Changes since v1:
> - fixed else/if logic in panfrost_devfreq_init
>
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> index 29fcffdf2d57..db798532b0b6 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
> @@ -140,7 +140,9 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
> return 0;
>
> ret = dev_pm_opp_of_add_table(&pfdev->pdev->dev);
> - if (ret)
> + if (ret == -ENODEV) /* Optional, continue without devfreq */
> + return 0;
> + else if (ret)
> return ret;
>
> panfrost_devfreq_reset(pfdev);
> @@ -170,6 +172,9 @@ void panfrost_devfreq_resume(struct panfrost_device *pfdev)
> {
> int i;
>
> + if (!pfdev->devfreq.devfreq)
> + return;
> +
> panfrost_devfreq_reset(pfdev);
> for (i = 0; i < NUM_JOB_SLOTS; i++)
> pfdev->devfreq.slot[i].busy = false;
> @@ -179,6 +184,9 @@ void panfrost_devfreq_resume(struct panfrost_device *pfdev)
>
> void panfrost_devfreq_suspend(struct panfrost_device *pfdev)
> {
> + if (!pfdev->devfreq.devfreq)
> + return;
> +
> devfreq_suspend_device(pfdev->devfreq.devfreq);
> }
>
> @@ -188,6 +196,9 @@ static void panfrost_devfreq_update_utilization(struct panfrost_device *pfdev, i
> ktime_t now;
> ktime_t last;
>
> + if (!pfdev->devfreq.devfreq)
> + return;
> +
> now = ktime_get();
> last = pfdev->devfreq.slot[slot].time_last_update;
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm/panfrost: make devfreq optional again
2019-06-05 15:02 [PATCH v2] drm/panfrost: make devfreq optional again Neil Armstrong
2019-06-05 18:50 ` Ezequiel Garcia
@ 2019-06-10 15:32 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Rob Herring @ 2019-06-10 15:32 UTC (permalink / raw)
To: Neil Armstrong
Cc: Clément Péron, Ezequiel Garcia, dri-devel, Tomeu Vizoso
On Wed, Jun 5, 2019 at 9:02 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> Devfreq runtime usage was made mandatory, thus making panfrost fail to probe
> on Amlogic S912 SoCs missing the "operating-points-v2" property.
> Make it optional again, leaving PM_DEVFREQ selected by default.
>
> Fixes: f3617b449d ("drm/panfrost: Select devfreq")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> Changes since v1:
> - fixed else/if logic in panfrost_devfreq_init
>
> drivers/gpu/drm/panfrost/panfrost_devfreq.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
Applied.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-10 15:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-05 15:02 [PATCH v2] drm/panfrost: make devfreq optional again Neil Armstrong
2019-06-05 18:50 ` Ezequiel Garcia
2019-06-10 15:32 ` Rob Herring
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.