drm/bridge: lt9611uxc: Register and attach our DSI device at probe

In order to avoid any probe ordering issue, the best practice is to move
the secondary MIPI-DSI device registration and attachment to the
MIPI-DSI host at probe time. Let's do this.

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211025151536.1048186-11-maxime@cerno.tech

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
index ab1a0c00aad8d1382681eaba61a0247fb1971d73..33f9716da0eea1831bb888038ce7b7e59cfa1e08 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
@@ -367,18 +367,6 @@ static int lt9611uxc_bridge_attach(struct drm_bridge *bridge,
                        return ret;
        }
 
-       /* Attach primary DSI */
-       lt9611uxc->dsi0 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi0_node);
-       if (IS_ERR(lt9611uxc->dsi0))
-               return PTR_ERR(lt9611uxc->dsi0);
-
-       /* Attach secondary DSI, if specified */
-       if (lt9611uxc->dsi1_node) {
-               lt9611uxc->dsi1 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi1_node);
-               if (IS_ERR(lt9611uxc->dsi1))
-                       return PTR_ERR(lt9611uxc->dsi1);
-       }
-
        return 0;
 }
 
@@ -958,8 +946,27 @@ retry:
 
        drm_bridge_add(&lt9611uxc->bridge);
 
+       /* Attach primary DSI */
+       lt9611uxc->dsi0 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi0_node);
+       if (IS_ERR(lt9611uxc->dsi0)) {
+               ret = PTR_ERR(lt9611uxc->dsi0);
+               goto err_remove_bridge;
+       }
+
+       /* Attach secondary DSI, if specified */
+       if (lt9611uxc->dsi1_node) {
+               lt9611uxc->dsi1 = lt9611uxc_attach_dsi(lt9611uxc, lt9611uxc->dsi1_node);
+               if (IS_ERR(lt9611uxc->dsi1)) {
+                       ret = PTR_ERR(lt9611uxc->dsi1);
+                       goto err_remove_bridge;
+               }
+       }
+
        return lt9611uxc_audio_init(dev, lt9611uxc);
 
+err_remove_bridge:
+       drm_bridge_remove(&lt9611uxc->bridge);
+
 err_disable_regulators:
        regulator_bulk_disable(ARRAY_SIZE(lt9611uxc->supplies), lt9611uxc->supplies);