[PATCH v4 06/13] drm/meson: fix unbind path if HDMI fails to bind

[Neil Armstrong]

If the case the HDMI controller fails to bind, we try to unbind
all components before calling drm_dev_put() which makes drm_bridge_detach()
crash because unbinding the HDMI controller frees the bridge memory.

The solution is the unbind all components at the end like in the remove
path.

Signed-off-by: Neil Armstrong <neil.armstr...@linaro.org>
---
 drivers/gpu/drm/meson/meson_drv.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/meson/meson_drv.c 
b/drivers/gpu/drm/meson/meson_drv.c
index bb72fda9106d..a30d61f1c817 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -316,32 +316,34 @@ static int meson_drv_bind_master(struct device *dev, bool 
has_components)
                goto exit_afbcd;
 
        if (has_components) {
-               ret = component_bind_all(drm->dev, drm);
+               ret = component_bind_all(dev, drm);
                if (ret) {
                        dev_err(drm->dev, "Couldn't bind all components\n");
+                       /* Do not try to unbind */
+                       has_components = false;
                        goto exit_afbcd;
                }
        }
 
        ret = meson_encoder_hdmi_init(priv);
        if (ret)
-               goto unbind_all;
+               goto exit_afbcd;
 
        ret = meson_plane_create(priv);
        if (ret)
-               goto unbind_all;
+               goto exit_afbcd;
 
        ret = meson_overlay_create(priv);
        if (ret)
-               goto unbind_all;
+               goto exit_afbcd;
 
        ret = meson_crtc_create(priv);
        if (ret)
-               goto unbind_all;
+               goto exit_afbcd;
 
        ret = request_irq(priv->vsync_irq, meson_irq, 0, drm->driver->name, 
drm);
        if (ret)
-               goto unbind_all;
+               goto exit_afbcd;
 
        drm_mode_config_reset(drm);
 
@@ -359,15 +361,18 @@ static int meson_drv_bind_master(struct device *dev, bool 
has_components)
 
 uninstall_irq:
        free_irq(priv->vsync_irq, drm);
-unbind_all:
-       if (has_components)
-               component_unbind_all(drm->dev, drm);
 exit_afbcd:
        if (priv->afbcd.ops)
                priv->afbcd.ops->exit(priv);
 free_drm:
        drm_dev_put(drm);
 
+       meson_encoder_hdmi_remove(priv);
+       meson_encoder_cvbs_remove(priv);
+
+       if (has_components)
+               component_unbind_all(dev, drm);
+
        return ret;
 }
 

-- 
2.34.1