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

disp: msm: sde: add esd check during wr_ptr wait

Browse Source 
Move esd check to write pointer wait instead of during
write pointer timeout. With this change display will avoid
improperly signaling a retire fence and allowing two flushes
to happen within a single vsync in cases where ESD failure
is happening.

Change-Id: I6fbd76a2f6b47d3237039f66a3b1edd1f72a0a1d
Signed-off-by: Samantha Tran <samtran@codeaurora.org>
This commit is contained in:
Samantha Tran
2021-06-14 12:53:26 -07:00
parent eacfafbaed
commit dc56d01f20
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
msm/sde/sde_connector.h
View File

@@ -742,6 +742,21 @@ static inline enum sde_rm_topology_name sde_connector_get_old_topology_name(
return c_state->old_topology_name; return c_state->old_topology_name;
} }
/**
* sde_connector_panel_dead - check if panel is dead
* @conn: pointer to drm connector
* Returns: bool indicating whether or not panel is dead based on connector
*/
static inline bool sde_connector_panel_dead(struct drm_connector *conn)
{
struct sde_connector *sde_conn = to_sde_connector(conn);
if (!sde_conn)
return true;
return sde_conn->panel_dead;
}
/** /**
* sde_connector_set_old_topology_name - helper to cache value of previous * sde_connector_set_old_topology_name - helper to cache value of previous
* mode's topology * mode's topology

5
msm/sde/sde_encoder_phys_cmd.c
View File

@@ -1449,7 +1449,7 @@ static int _sde_encoder_phys_cmd_wait_for_wr_ptr(
if (ctl && ctl->ops.get_start_state) if (ctl && ctl->ops.get_start_state)
frame_pending = ctl->ops.get_start_state(ctl); frame_pending = ctl->ops.get_start_state(ctl);
ret = frame_pending ? ret : 0; ret = (frame_pending || sde_connector_esd_status(phys_enc->connector)) ? ret : 0;
/* /*
* There can be few cases of ESD where CTL_START is cleared but * There can be few cases of ESD where CTL_START is cleared but
@@ -1521,8 +1521,7 @@ static int _sde_encoder_phys_cmd_handle_wr_ptr_timeout(
SDE_EVT32(DRMID(phys_enc->parent), switch_te, SDE_EVTLOG_FUNC_ENTRY); SDE_EVT32(DRMID(phys_enc->parent), switch_te, SDE_EVTLOG_FUNC_ENTRY);
if (sde_connector_esd_status(phys_enc->connector)) { if (sde_connector_panel_dead(phys_enc->connector)) {
/* watchdog TE already set on esd status check failure */
ret = _sde_encoder_phys_cmd_wait_for_wr_ptr(phys_enc); ret = _sde_encoder_phys_cmd_wait_for_wr_ptr(phys_enc);
} else if (switch_te) { } else if (switch_te) {
SDE_DEBUG_CMDENC(cmd_enc, SDE_DEBUG_CMDENC(cmd_enc,