samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qctecmdr
2020-09-09 02:29:19 -07:00
committed by Gerrit - the friendly Code Review server
parent a56d1440d0 998dec67d8
commit 3ee7b6f685
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
msm/dsi/dsi_ctrl.c
View File

@@ -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); dsi_ctrl->hw.ops.video_engine_en(&dsi_ctrl->hw, on);
/* perform a reset when turning off video engine */ /* 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); dsi_ctrl->hw.ops.soft_reset(&dsi_ctrl->hw);
} }

2
msm/dsi/dsi_ctrl_hw.h
View File

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

1
msm/dsi/dsi_ctrl_hw_cmn.c
View File

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