From 02e876c533e251bc1ee7ae662b8d5ba6f5c83a13 Mon Sep 17 00:00:00 2001 From: nieqiang Date: Thu, 20 Aug 2020 11:00:31 +0800 Subject: [PATCH] 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 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 --- msm/dsi/dsi_display.c | 4 ++-- msm/dsi/dsi_panel.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c index 1eb58157e42d..a95b8a70634b 100644 --- a/msm/dsi/dsi_display.c +++ b/msm/dsi/dsi_display.c @@ -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) { diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c index 0143ad87ff4a..cccfc795887f 100644 --- a/msm/dsi/dsi_panel.c +++ b/msm/dsi/dsi_panel.c @@ -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) {