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: Panic on getting continuous ESD check failures"

Browse Source
This commit is contained in:
qctecmdr
2020-09-29 09:59:58 -07:00
committed by Gerrit - the friendly Code Review server
parent 43cafa8095 93fa9bdf60
commit 90c3cec488
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
msm/sde/sde_connector.c
View File

@@ -2380,6 +2380,8 @@ static void _sde_connector_report_panel_dead(struct sde_connector *conn,
bool skip_pre_kickoff)
{
struct drm_event event;
struct dsi_display *display;
u32 const max_conseq_esd_fail_count = 5;
if (!conn)
return;
@@ -2403,6 +2405,17 @@ static void _sde_connector_report_panel_dead(struct sde_connector *conn,
conn->base.dev, &event, (u8 *)&conn->panel_dead);
SDE_ERROR("esd check failed report PANEL_DEAD conn_id: %d enc_id: %d\n",
conn->base.base.id, conn->encoder->base.id);
if (conn->connector_type != DRM_MODE_CONNECTOR_DSI)
return;
display = (struct dsi_display *)conn->display;
display->esd_fail_count++;
if (display->esd_fail_count == max_conseq_esd_fail_count) {
SDE_ERROR("Triggered reset on multiple PANEL_DEAD instances\n");
SDE_DBG_DUMP("all", "dbg_bus", "dsi_dbg_bus",
"vbif_dbg_bus", "panic");
}
}
int sde_connector_esd_status(struct drm_connector *conn)
@@ -2440,8 +2453,16 @@ int sde_connector_esd_status(struct drm_connector *conn)
SDE_DEBUG("Successfully received TE from panel\n");
ret = 0;
}
SDE_EVT32(ret);
if (sde_conn->connector_type == DRM_MODE_CONNECTOR_DSI) {
/* Reset esd_fail_count on recovery */
if (!ret)
display->esd_fail_count = 0;
SDE_EVT32(ret, display->esd_fail_count);
return ret;
}
SDE_EVT32(ret);
return ret;
}
@@ -2450,6 +2471,7 @@ static void sde_connector_check_status_work(struct work_struct *work)
struct sde_connector *conn;
int rc = 0;
struct device *dev;
struct dsi_display *display;
conn = container_of(to_delayed_work(work),
struct sde_connector, status_work);
@@ -2482,6 +2504,12 @@ static void sde_connector_check_status_work(struct work_struct *work)
conn->esd_status_interval : STATUS_CHECK_INTERVAL_MS;
schedule_delayed_work(&conn->status_work,
msecs_to_jiffies(interval));
/* Successful ESD check */
if (conn->connector_type == DRM_MODE_CONNECTOR_DSI) {
display = conn->display;
display->esd_fail_count = 0;
}
return;
}