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

Revert "disp: msm: dsi: allow cmd-engine enable/disable HW op at all times"

Browse Source 
This reverts commit 65f3cc37a4.

This change breaks TUI use-cases by allowing CMD engine to be
disabled on trusted VM without primary VM having knowledge of
this HW update.

Change-Id: Ieb67dc841299a149e9f1028fd8f98bd857f1f711
Signed-off-by: Steve Cohen <cohens@codeaurora.org>
This commit is contained in:
Steve Cohen
2021-08-26 02:08:43 -04:00
parent b57a445cf4
commit 1416e72e62
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
msm/dsi/dsi_display.c
View File

@@ -279,7 +279,8 @@ static int dsi_display_cmd_engine_enable(struct dsi_display *display)
m_ctrl = &display->ctrl[display->cmd_master_idx];
mutex_lock(&m_ctrl->ctrl->ctrl_lock);
rc = dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl, DSI_CTRL_ENGINE_ON);
rc = dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl,
DSI_CTRL_ENGINE_ON, skip_op);
if (rc) {
DSI_ERR("[%s] enable mcmd engine failed, skip_op:%d rc:%d\n",
display->name, skip_op, rc);
@@ -291,7 +292,8 @@ static int dsi_display_cmd_engine_enable(struct dsi_display *display)
if (!ctrl->ctrl || (ctrl == m_ctrl))
continue;
rc = dsi_ctrl_set_cmd_engine_state(ctrl->ctrl, DSI_CTRL_ENGINE_ON);
rc = dsi_ctrl_set_cmd_engine_state(ctrl->ctrl,
DSI_CTRL_ENGINE_ON, skip_op);
if (rc) {
DSI_ERR(
"[%s] enable cmd engine failed, skip_op:%d rc:%d\n",
@@ -302,7 +304,8 @@ static int dsi_display_cmd_engine_enable(struct dsi_display *display)
goto done;
error_disable_master:
(void)dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl, DSI_CTRL_ENGINE_OFF);
(void)dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl,
DSI_CTRL_ENGINE_OFF, skip_op);
done:
mutex_unlock(&m_ctrl->ctrl->ctrl_lock);
return rc;
@@ -323,14 +326,16 @@ static int dsi_display_cmd_engine_disable(struct dsi_display *display)
if (!ctrl->ctrl || (ctrl == m_ctrl))
continue;
rc = dsi_ctrl_set_cmd_engine_state(ctrl->ctrl, DSI_CTRL_ENGINE_OFF);
rc = dsi_ctrl_set_cmd_engine_state(ctrl->ctrl,
DSI_CTRL_ENGINE_OFF, skip_op);
if (rc)
DSI_ERR(
"[%s] disable cmd engine failed, skip_op:%d rc:%d\n",
display->name, skip_op, rc);
}
rc = dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl, DSI_CTRL_ENGINE_OFF);
rc = dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl,
DSI_CTRL_ENGINE_OFF, skip_op);
if (rc)
DSI_ERR("[%s] disable mcmd engine failed, skip_op:%d rc:%d\n",
display->name, skip_op, rc);