msm: modify dsi_display_status_check_te,fix rebase error

Fix rebase error
Modify dsi_display_status_check_te

Change-Id: I18a7418f7f827557eb1473e1c7cbf5ea32e102d7
Signed-off-by: nieqiang <nieqiang@motorola.com>
Reviewed-on: https://gerrit.mot.com/1728082
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Submit-Approved: Jira Key
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
This commit is contained in:
nieqiang 2020-08-20 11:00:31 +08:00 • committed by tongkun1
commit 02e876c533
2 changed files with 4 additions and 2 deletions

View file

@ -946,7 +946,7 @@ int dsi_display_check_status(struct drm_connector *connector, void *display,
rc = dsi_display_status_check_te(dsi_display, te_rechecks);
te_check_override = false;
} else if (status_mode == ESD_MODE_TE_CHK_REG_RD) {
rc = dsi_display_status_check_te(dsi_display);
rc = dsi_display_status_check_te(dsi_display, te_rechecks);
if (rc > 0) {
/* after checking for TE, then chk for reg_read status */
rc = dsi_display_status_reg_read(dsi_display);
@ -8839,7 +8839,7 @@ static int dsi_display_chk_esd_recovery(struct dsi_display *display)
* if it is not, then trigger the ESD again
*/
disp_esd_trigger++;
if (dsi_display_status_check_te(display) <= 0) {
if (dsi_display_status_check_te(display, 1) <= 0) {
DSI_ERR("ESD: TE Check is still failed. disp_esd_trigger=%d\n",
disp_esd_trigger);
} else if (dsi_display_status_reg_read(display) <= 0) {

View file

@ -3850,6 +3850,8 @@ static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
panel->panel_ops.parse_gpios = dsi_panel_parse_gpios;
panel->panel_ops.parse_power_cfg = dsi_panel_parse_power_cfg;
}
}
static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
struct device_node *of_node, u32 panel_idx)
{