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

Цей коміт міститься в:
qctecmdr
2021-08-13 20:50:46 -07:00
зафіксовано Gerrit - the friendly Code Review server
джерело 7986d0d1b1 65f3cc37a4
коміт c9fb272a73
3 змінених файлів з 16 додано та 27 видалено

Переглянути файл

@@ -279,8 +279,7 @@ 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, skip_op);
rc = dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl, DSI_CTRL_ENGINE_ON);
if (rc) {
DSI_ERR("[%s] enable mcmd engine failed, skip_op:%d rc:%d\n",
display->name, skip_op, rc);
@@ -292,8 +291,7 @@ 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, skip_op);
rc = dsi_ctrl_set_cmd_engine_state(ctrl->ctrl, DSI_CTRL_ENGINE_ON);
if (rc) {
DSI_ERR(
"[%s] enable cmd engine failed, skip_op:%d rc:%d\n",
@@ -304,8 +302,7 @@ 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, skip_op);
(void)dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl, DSI_CTRL_ENGINE_OFF);
done:
mutex_unlock(&m_ctrl->ctrl->ctrl_lock);
return rc;
@@ -326,16 +323,14 @@ 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, skip_op);
rc = dsi_ctrl_set_cmd_engine_state(ctrl->ctrl, DSI_CTRL_ENGINE_OFF);
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, skip_op);
rc = dsi_ctrl_set_cmd_engine_state(m_ctrl->ctrl, DSI_CTRL_ENGINE_OFF);
if (rc)
DSI_ERR("[%s] disable mcmd engine failed, skip_op:%d rc:%d\n",
display->name, skip_op, rc);