MLK-17137-1: drm/imx: Fix unbind for nwl_dsi-imx

In unbind function, first we need to detach the bridge, then do the
encoder cleanup, so that the bridge will do a proper detach.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>

diff --git a/drivers/gpu/drm/imx/nwl_dsi-imx.c b/drivers/gpu/drm/imx/nwl_dsi-imx.c
index 1ab22b3..1cb85eb 100644 (file)
--- a/drivers/gpu/drm/imx/nwl_dsi-imx.c
+++ b/drivers/gpu/drm/imx/nwl_dsi-imx.c
@@ -880,11 +880,12 @@ static void imx_nwl_dsi_unbind(struct device *dev,
 
        DRM_DEV_INFO(dev, "id = %s\n", (dsi->instance)?"DSI1":"DSI0");
 
+       drm_bridge_detach(dsi->next_bridge);
+
        imx_nwl_dsi_encoder_disable(&dsi->encoder);
 
        drm_encoder_cleanup(&dsi->encoder);
 
-       drm_bridge_detach(dsi->next_bridge);
 }
 
 static const struct component_ops imx_nwl_dsi_component_ops = {