Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c3b526e authored by Neil Armstrong's avatar Neil Armstrong Committed by Rob Herring
Browse files

drm/panfrost: make devfreq optional again 



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: f3617b44 ("drm/panfrost: Select devfreq")
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190605150233.32722-1-narmstrong@baylibre.com
parent be7d9f05

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+12 −1
Original line number Diff line number Diff line
@@ -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;