Revert "drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers"

This reverts commit f53a045793289483b3c2930007fc52c7f1f642d5.

This and the dependent fixes broke display on RB5.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
index b58842f69fff1b183a6d30fd139d6256ea5e44a3..c4454d0f6cad5d1f65dd1a8c4760b71a9be586d1 100644 (file)
--- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
+++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c
@@ -258,18 +258,17 @@ static struct mipi_dsi_device *lt9611uxc_attach_dsi(struct lt9611uxc *lt9611uxc,
        const struct mipi_dsi_device_info info = { "lt9611uxc", 0, NULL };
        struct mipi_dsi_device *dsi;
        struct mipi_dsi_host *host;
-       struct device *dev = lt9611uxc->dev;
        int ret;
 
        host = of_find_mipi_dsi_host_by_node(dsi_node);
        if (!host) {
-               dev_err(dev, "failed to find dsi host\n");
+               dev_err(lt9611uxc->dev, "failed to find dsi host\n");
                return ERR_PTR(-EPROBE_DEFER);
        }
 
-       dsi = devm_mipi_dsi_device_register_full(dev, host, &info);
+       dsi = mipi_dsi_device_register_full(host, &info);
        if (IS_ERR(dsi)) {
-               dev_err(dev, "failed to create dsi device\n");
+               dev_err(lt9611uxc->dev, "failed to create dsi device\n");
                return dsi;
        }
 
@@ -278,9 +277,10 @@ static struct mipi_dsi_device *lt9611uxc_attach_dsi(struct lt9611uxc *lt9611uxc,
        dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
                          MIPI_DSI_MODE_VIDEO_HSE;
 
-       ret = devm_mipi_dsi_attach(dev, dsi);
+       ret = mipi_dsi_attach(dsi);
        if (ret < 0) {
-               dev_err(dev, "failed to attach dsi to host\n");
+               dev_err(lt9611uxc->dev, "failed to attach dsi to host\n");
+               mipi_dsi_device_unregister(dsi);
                return ERR_PTR(ret);
        }
 
@@ -355,6 +355,19 @@ static int lt9611uxc_connector_init(struct drm_bridge *bridge, struct lt9611uxc
        return drm_connector_attach_encoder(&lt9611uxc->connector, bridge->encoder);
 }
 
+static void lt9611uxc_bridge_detach(struct drm_bridge *bridge)
+{
+       struct lt9611uxc *lt9611uxc = bridge_to_lt9611uxc(bridge);
+
+       if (lt9611uxc->dsi1) {
+               mipi_dsi_detach(lt9611uxc->dsi1);
+               mipi_dsi_device_unregister(lt9611uxc->dsi1);
+       }
+
+       mipi_dsi_detach(lt9611uxc->dsi0);
+       mipi_dsi_device_unregister(lt9611uxc->dsi0);
+}
+
 static int lt9611uxc_bridge_attach(struct drm_bridge *bridge,
                                   enum drm_bridge_attach_flags flags)
 {
@@ -375,11 +388,19 @@ static int lt9611uxc_bridge_attach(struct drm_bridge *bridge,
        /* 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);
+               if (IS_ERR(lt9611uxc->dsi1)) {
+                       ret = PTR_ERR(lt9611uxc->dsi1);
+                       goto err_unregister_dsi0;
+               }
        }
 
        return 0;
+
+err_unregister_dsi0:
+       mipi_dsi_detach(lt9611uxc->dsi0);
+       mipi_dsi_device_unregister(lt9611uxc->dsi0);
+
+       return ret;
 }
 
 static enum drm_mode_status
@@ -523,6 +544,7 @@ static struct edid *lt9611uxc_bridge_get_edid(struct drm_bridge *bridge,
 
 static const struct drm_bridge_funcs lt9611uxc_bridge_funcs = {
        .attach = lt9611uxc_bridge_attach,
+       .detach = lt9611uxc_bridge_detach,
        .mode_valid = lt9611uxc_bridge_mode_valid,
        .mode_set = lt9611uxc_bridge_mode_set,
        .detect = lt9611uxc_bridge_detect,