drm/msm: Depopulate platform on probe failure

[ Upstream commit 4368a1539c6b41ac3cddc06f5a5117952998804c ]

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).

Reviewed-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190617201301.133275-3-sean@poorly.run
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 606df7bea97bff05691b41993ee741088c3d86dd..b970427e53a7afb931ab446f16aa26428d557b47 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -1097,16 +1097,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 0;
 
-       return component_master_add_with_match(&pdev->dev, &msm_drm_ops, match);
+fail:
+       of_platform_depopulate(&pdev->dev);
+       return ret;
 }
 
 static int msm_pdev_remove(struct platform_device *pdev)