1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 4a0b9150a7bb..b91c4616644a 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -622,6 +622,15 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi)
         if (--dsi->refcount != 0)
                 return;
 
+        /*
+         * mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since
+         * mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(),
+         * which needs irq for vblank, and mtk_dsi_stop() will disable irq.
+         * mtk_dsi_start() needs to be called in mtk_output_dsi_enable(),
+         * after dsi is fully set.
+         */
+        mtk_dsi_stop(dsi);
+
         if (!mtk_dsi_switch_to_cmd_mode(dsi, VM_DONE_INT_FLAG, 500)) {
                 if (dsi->panel) {
                         if (drm_panel_unprepare(dsi->panel)) {
@@ -688,7 +697,6 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi)
                 }
         }
 
-        mtk_dsi_stop(dsi);
         mtk_dsi_poweroff(dsi);
 
         dsi->enabled = false;
@@ -836,6 +844,8 @@ static void mtk_dsi_destroy_conn_enc(struct mtk_dsi *dsi)
         /* Skip connector cleanup if creation was delegated to the bridge */
         if (dsi->conn.dev)
                 drm_connector_cleanup(&dsi->conn);
+        if (dsi->panel)
+                drm_panel_detach(dsi->panel);
 }
 
 static void mtk_dsi_ddp_start(struct mtk_ddp_comp *comp)