[3/3] drm/msm/adreno: Call pm_runtime_force_suspend() during unbind
diff mbox series

Message ID 1557256691-25798-4-git-send-email-jcrouse@codeaurora.org
State New
Headers show
  • drm/msm: Handle component bind failures a bit better
Related show

Commit Message

Jordan Crouse May 7, 2019, 7:18 p.m. UTC
The GPU specific pm_suspend code assumes that the hardware is active
when the function is called, which it usually is when called as part
of pm_runtime.  But during unbind, the pm_suspend functions are called
blindly resulting in a bit of a when the hardware wasn't already
active (or booted, in the case of the GMU).

Instead of calling the pm_suspend function directly, use
pm_runtime_force_suspend() which should check the correct state of
runtime and call the functions on our behalf or skip them if they are
not needed.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

 drivers/gpu/drm/msm/adreno/a6xx_gmu.c      | 4 +---
 drivers/gpu/drm/msm/adreno/adreno_device.c | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff mbox series

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index 9155daf..447706d 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -1230,9 +1230,7 @@  void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)
 	if (IS_ERR_OR_NULL(gmu->mmio))
-	a6xx_gmu_stop(a6xx_gpu);
-	pm_runtime_disable(gmu->dev);
+	pm_runtime_force_suspend(gmu->dev);
 	if (!IS_ERR(gmu->gxpd)) {
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c
index b907245..3dd90df 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -351,7 +351,7 @@  static void adreno_unbind(struct device *dev, struct device *master,
 	struct msm_gpu *gpu = dev_get_drvdata(dev);
-	gpu->funcs->pm_suspend(gpu);
+	pm_runtime_force_suspend(dev);
 	set_gpu_pdev(dev_get_drvdata(master), NULL);