[[DPU] ] drm/msm/dpu: Correct dpu destroy and disable order

Submitted by Jayant Shekhar on Nov. 2, 2018, 6:17 a.m.

Details

Message ID 1541139427-25842-1-git-send-email-jshekhar@codeaurora.org
State New
Headers show
Series "] drm/msm/dpu: Correct dpu destroy and disable order" ( rev: 1 ) in Freedreno

Not browsing as part of any series.

Commit Message

Jayant Shekhar Nov. 2, 2018, 6:17 a.m.
In case of msm drm bind failure, dpu_mdss_destroy is triggered.
In this function, resources are freed and pm runtime disable is
called, which triggers dpu_mdss_disable. Now in dpu_mdss_disable,
driver tries to access a memory which is already freed. This
results in kernel panic. Fix this by ensuring proper sequence
of dpu destroy and disable calls.

Change-Id: Id6e01a537ae9c40789c5752dc28c397391ab7dfe
Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c
index fd9c893..cd9a6bd 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c
@@ -156,6 +156,8 @@  static void dpu_mdss_destroy(struct drm_device *dev)
 	struct dpu_mdss *dpu_mdss = to_dpu_mdss(priv->mdss);
 	struct dss_module_power *mp = &dpu_mdss->mp;
 
+	pm_runtime_disable(dev->dev);
+
 	_dpu_mdss_irq_domain_fini(dpu_mdss);
 
 	free_irq(platform_get_irq(pdev, 0), dpu_mdss);
@@ -167,7 +169,6 @@  static void dpu_mdss_destroy(struct drm_device *dev)
 		devm_iounmap(&pdev->dev, dpu_mdss->mmio);
 	dpu_mdss->mmio = NULL;
 
-	pm_runtime_disable(dev->dev);
 	priv->mdss = NULL;
 }