Merge "disp: msm: dsi: Skip soft reset during display disable"

msm/dsi/dsi_ctrl.c

@@ -3686,7 +3686,7 @@ int dsi_ctrl_set_vid_engine_state(struct dsi_ctrl *dsi_ctrl,
 		dsi_ctrl->hw.ops.video_engine_en(&dsi_ctrl->hw, on);
 
 		/* perform a reset when turning off video engine */
-		if (!on)
+		if (!on && dsi_ctrl->version < DSI_CTRL_VERSION_1_3)
 			dsi_ctrl->hw.ops.soft_reset(&dsi_ctrl->hw);
 	}
 

msm/dsi/dsi_ctrl_hw.h

@@ -31,6 +31,7 @@
 /**
  * enum dsi_ctrl_version - version of the dsi host controller
  * @DSI_CTRL_VERSION_UNKNOWN: Unknown controller version
+ * @DSI_CTRL_VERSION_1_3:     DSI host v1.3 controller
  * @DSI_CTRL_VERSION_1_4:     DSI host v1.4 controller
  * @DSI_CTRL_VERSION_2_0:     DSI host v2.0 controller
  * @DSI_CTRL_VERSION_2_2:     DSI host v2.2 controller
@@ -41,6 +42,7 @@
  */
 enum dsi_ctrl_version {
 	DSI_CTRL_VERSION_UNKNOWN,
+	DSI_CTRL_VERSION_1_3,
 	DSI_CTRL_VERSION_1_4,
 	DSI_CTRL_VERSION_2_0,
 	DSI_CTRL_VERSION_2_2,

msm/dsi/dsi_ctrl_hw_cmn.c

@@ -199,6 +199,7 @@ void dsi_ctrl_hw_cmn_soft_reset(struct dsi_ctrl_hw *ctrl)
 	DSI_W32(ctrl, DSI_CTRL, reg_ctrl);
 	wmb(); /* make sure DSI controller is enabled again */
 	DSI_CTRL_HW_DBG(ctrl, "ctrl soft reset done\n");
+	SDE_EVT32(ctrl->index);
 }
 
 /**