mirror of
https://github.com/Fishwaldo/build.git
synced 2025-04-14 10:01:31 +00:00
2a3d8a8f99
* Create sun50i-h6-drm_panfrost-missing-remove-opp-table-in-case-of-failure.patch * Create sun50i-h6-drm_panfrost-add-devfreq-regulator-support.patch * Rename sun50i-h6-drm_panfrost-add-devfreq-regulator-support.patch to sun50i-h6-drm_panfrost-2-add-devfreq-regulator-support.patch * Rename sun50i-h6-drm_panfrost-missing-remove-opp-table-in-case-of-failure.patch to sun50i-h6-drm_panfrost-1-missing-remove-opp-table-in-case-of-failure.patch
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
---
|
|
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
|
|
index 413987038fbf..62541f4edd81 100644
|
|
--- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c
|
|
+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c
|
|
@@ -90,8 +90,11 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
|
|
cur_freq = clk_get_rate(pfdev->clock);
|
|
|
|
opp = devfreq_recommended_opp(dev, &cur_freq, 0);
|
|
- if (IS_ERR(opp))
|
|
- return PTR_ERR(opp);
|
|
+ if (IS_ERR(opp)) {
|
|
+ DRM_DEV_ERROR(dev, "Failed to set recommended OPP\n");
|
|
+ ret = PTR_ERR(opp);
|
|
+ goto err_opp;
|
|
+ }
|
|
|
|
panfrost_devfreq_profile.initial_freq = cur_freq;
|
|
dev_pm_opp_put(opp);
|
|
@@ -100,8 +103,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
|
|
DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);
|
|
if (IS_ERR(devfreq)) {
|
|
DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");
|
|
- dev_pm_opp_of_remove_table(dev);
|
|
- return PTR_ERR(devfreq);
|
|
+ ret = PTR_ERR(devfreq);
|
|
+ goto err_opp;
|
|
}
|
|
pfdev->devfreq.devfreq = devfreq;
|
|
|
|
@@ -112,6 +115,11 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
|
|
pfdev->devfreq.cooling = cooling;
|
|
|
|
return 0;
|
|
+
|
|
+err_opp:
|
|
+ dev_pm_opp_of_remove_table(dev);
|
|
+
|
|
+ return ret;
|
|
}
|
|
|
|
void panfrost_devfreq_fini(struct panfrost_device *pfdev)
|
|
--
|
|
2.20.1
|