[06/13] drm/msm: Depopulate platform on probe failure

Submitted by Sean Paul on June 17, 2019, 8:12 p.m.


Message ID 20190617201301.133275-3-sean@poorly.run
State Accepted
Commit 4368a1539c6b41ac3cddc06f5a5117952998804c
Headers show
Series "Series without cover letter" ( rev: 3 ) in DRI devel

Not browsing as part of any series.

Commit Message

Sean Paul June 17, 2019, 8:12 p.m.
From: Sean Paul <seanpaul@chromium.org>

add_display_components() calls of_platform_populate, and we depopluate
on pdev remove, but not when probe fails. So if we get a probe deferral
in one of the components, we won't depopulate the platform. This causes
the core to keep references to devices which should be destroyed, which
causes issues when those same devices try to re-initialize on the next
probe attempt.

I think this is the reason we had issues with the gmu's device-managed
resources on deferral (worked around in commit 94e3a17f33a5).

Signed-off-by: Sean Paul <seanpaul@chromium.org>
 drivers/gpu/drm/msm/msm_drv.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 31deb87abfc6..bf99ee138601 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -1317,16 +1317,24 @@  static int msm_pdev_probe(struct platform_device *pdev)
 	ret = add_gpu_components(&pdev->dev, &match);
 	if (ret)
-		return ret;
+		goto fail;
 	/* on all devices that I am aware of, iommu's which can map
 	 * any address the cpu can see are used:
 	ret = dma_set_mask_and_coherent(&pdev->dev, ~0);
 	if (ret)
-		return ret;
+		goto fail;
+	ret = component_master_add_with_match(&pdev->dev, &msm_drm_ops, match);
+	if (ret)
+		goto fail;
-	return component_master_add_with_match(&pdev->dev, &msm_drm_ops, match);
+	return 0;
+	of_platform_depopulate(&pdev->dev);
+	return ret;
 static int msm_pdev_remove(struct platform_device *pdev)