All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/panfrost: missing remove opp table in case of failure
@ 2020-04-11 20:06 ` Clément Péron
  0 siblings, 0 replies; 52+ messages in thread
From: Clément Péron @ 2020-04-11 20:06 UTC (permalink / raw)
  To: Rob Herring, Tomeu Vizoso, Steven Price, Alyssa Rosenzweig,
	Viresh Kumar, Nishanth Menon, Stephen Boyd
  Cc: dri-devel, linux-kernel, Clément Péron

In case of failure we need to remove OPP table.

Use Linux classic error handling with goto usage.

Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 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


^ permalink raw reply related	[flat|nested] 52+ messages in thread

end of thread, other threads:[~2020-05-11  7:17 UTC | newest]

Thread overview: 52+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-11 20:06 [PATCH 1/2] drm/panfrost: missing remove opp table in case of failure Clément Péron
2020-04-11 20:06 ` Clément Péron
2020-04-11 20:06 ` [PATCH 2/2] drm/panfrost: add devfreq regulator support Clément Péron
2020-04-11 20:06   ` Clément Péron
2020-04-13 11:33   ` Clément Péron
2020-04-13 11:33     ` Clément Péron
2020-04-13 13:18   ` Steven Price
2020-04-13 13:18     ` Steven Price
2020-04-13 14:18     ` Clément Péron
2020-04-13 14:18       ` Clément Péron
2020-04-13 14:31       ` Clément Péron
2020-04-13 14:31         ` Clément Péron
2020-04-13 15:55         ` Steven Price
2020-04-13 15:55           ` Steven Price
2020-04-13 16:35           ` Clément Péron
2020-04-13 16:35             ` Clément Péron
2020-04-13 17:28             ` Clément Péron
2020-04-13 17:28               ` Clément Péron
2020-04-14 13:10               ` Steven Price
2020-04-14 13:10                 ` Steven Price
2020-04-14 18:20                 ` Clément Péron
2020-04-14 18:20                   ` Clément Péron
2020-04-14 18:55                   ` Mark Brown
2020-04-14 18:55                     ` Mark Brown
2020-04-14 19:16                     ` Clément Péron
2020-04-14 19:16                       ` Clément Péron
2020-04-16 13:42                       ` Multiple regulators for one device [was drm/panfrost: add devfreq regulator support] Steven Price
2020-04-16 13:42                         ` Steven Price
2020-04-16 14:04                         ` Mark Brown
2020-04-16 14:04                           ` Mark Brown
2020-04-17 11:10                         ` Robin Murphy
2020-04-17 11:10                           ` Robin Murphy
2020-04-17 12:33                           ` Clément Péron
2020-04-17 12:33                             ` Clément Péron
2020-04-19  9:25                             ` Clément Péron
2020-04-19  9:25                               ` Clément Péron
2020-04-20 12:32                               ` Mark Brown
2020-04-20 12:32                                 ` Mark Brown
2020-04-16 13:44                       ` [PATCH 2/2] drm/panfrost: add devfreq regulator support Mark Brown
2020-04-16 13:44                         ` Mark Brown
2020-05-02 22:07                 ` Clément Péron
2020-05-02 22:07                   ` Clément Péron
2020-05-07 14:30                   ` Steven Price
2020-05-07 14:30                     ` Steven Price
2020-05-09 16:28                     ` Clément Péron
2020-05-09 16:28                       ` Clément Péron
2020-05-09 19:40                       ` Clément Péron
2020-05-09 19:40                         ` Clément Péron
2020-04-14 13:09       ` Robin Murphy
2020-04-14 13:09         ` Robin Murphy
2020-04-13 13:07 ` [PATCH 1/2] drm/panfrost: missing remove opp table in case of failure Steven Price
2020-04-13 13:07   ` Steven Price

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.