Skip to contentSkip to conversation

drm/panfrost: Remove opp table when unloading

PATCH Applied Steven Price 2 participants 2 messages Aug 16, 2019 – Aug 19, 2019

Subsystems (3)
lore
Share & tools
lore

Steven Price

author maintainer
#0 lore raw

PATCH 1/1 drm/panfrost: Remove opp table when unloading

The devfreq opp table needs to be removed when unloading the driver to free the memory associated with it.

---
 drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++++++
 drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 +
 drivers/gpu/drm/panfrost/panfrost_drv.c     | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/panfrost/panfrost_devfreq.c +6 -0
index 77e1ad24de53..710d903f8e0d 100644
@@ -160,12 +160,18 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev)
 		DRM_DEV_ERROR(&pfdev->pdev->dev, "Couldn't initialize GPU devfreq\n");
 		ret = PTR_ERR(pfdev->devfreq.devfreq);
 		pfdev->devfreq.devfreq = NULL;
+		dev_pm_opp_of_remove_table(&pfdev->pdev->dev);
 		return ret;
 	}
 
 	return 0;
 }
 
+void panfrost_devfreq_fini(struct panfrost_device *pfdev)
+{
+	dev_pm_opp_of_remove_table(&pfdev->pdev->dev);
+}
+
 void panfrost_devfreq_resume(struct panfrost_device *pfdev)
 {
 	int i;
drivers/gpu/drm/panfrost/panfrost_devfreq.h +1 -0
index eb999531ed90..e3bc63e82843 100644
@@ -5,6 +5,7 @@
 #define __PANFROST_DEVFREQ_H__
 
 int panfrost_devfreq_init(struct panfrost_device *pfdev);
+void panfrost_devfreq_fini(struct panfrost_device *pfdev);
 
 void panfrost_devfreq_resume(struct panfrost_device *pfdev);
 void panfrost_devfreq_suspend(struct panfrost_device *pfdev);
drivers/gpu/drm/panfrost/panfrost_drv.c +4 -1
index ae70200be44a..44a558c6e17e 100644
@@ -547,12 +547,14 @@ static int panfrost_probe(struct platform_device *pdev)
 	 */
 	err = drm_dev_register(ddev, 0);
 	if (err < 0)
-		goto err_out1;
+		goto err_out2;
 
 	panfrost_gem_shrinker_init(ddev);
 
 	return 0;
 
+err_out2:
+	panfrost_devfreq_fini(pfdev);
 err_out1:
 	panfrost_device_fini(pfdev);
 err_out0:
@@ -571,6 +573,7 @@ static int panfrost_remove(struct platform_device *pdev)
 	pm_runtime_get_sync(pfdev->dev);
 	pm_runtime_put_sync_autosuspend(pfdev->dev);
 	pm_runtime_disable(pfdev->dev);
+	panfrost_devfreq_fini(pfdev);
 	panfrost_device_fini(pfdev);
 	drm_dev_put(ddev);
 	return 0;
Signature · 1 line
2.20.1
maintainer Applied
#1 lore raw
Quoted 10 lines · Steven Price

The devfreq opp table needs to be removed when unloading the driver to free the memory associated with it.

---
 drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++++++
 drivers/gpu/drm/panfrost/panfrost_devfreq.h | 1 +
 drivers/gpu/drm/panfrost/panfrost_drv.c     | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

Applied, thanks.

Rob