From e0ac15bcc0d64662451b9ac744bf1aed9022ebad Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 09:46:07 -0500
Subject: [PATCH] disp: msm: Provide a dynamic method to disable the ESD.

Providing a dynamic method to disable ESD detection and recovery with UTAGS.

Port from: 1adab9a

Change-Id: I767666d2e802e40af9c8f3508e84b76df365ea38
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444399
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509801
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c   | 13 +++++++++++++
 msm/dsi/dsi_display.h   |  7 +++++++
 msm/sde/sde_connector.c |  6 ++++--
 msm/sde/sde_connector.h |  7 +++++++
 msm/sde/sde_kms.c       |  3 +++
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 03e075f5a639..03f7ca1ab4a1 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -898,6 +898,19 @@ release_panel_lock:
 	return rc;
 }
 
+bool dsi_display_force_esd_disable(void *display)
+{
+	struct dsi_display *dsi_display = display;
+	struct dsi_panel *panel;
+
+	if (dsi_display == NULL)
+		return false;
+
+	panel = dsi_display->panel;
+
+	return (panel->esd_utag_enable? false: true);
+}
+
 static int dsi_display_cmd_prepare(const char *cmd_buf, u32 cmd_buf_len,
 		struct dsi_cmd_desc *cmd, u8 *payload, u32 payload_len)
 {
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index a97c77f59d24..ea65e6b68a77 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -670,6 +670,13 @@ int dsi_display_motUtil_transfer(void *display, const char *cmd_buf,
 		u32 cmd_buf_len, struct motUtil *motUtil_data);
 
 
+/**
+ * dsi_display_force_esd_disable() - check if ESD UTAG is forced to disable ESD
+ * @display:            Handle to display.
+ */
+bool dsi_display_force_esd_disable(void *display);
+
+
 /**
  * dsi_display_soft_reset() - perform a soft reset on DSI controller
  * @display:         Handle to display
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 35f678373c1d..a470f0cc52ca 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -488,8 +488,10 @@ void sde_connector_schedule_status_work(struct drm_connector *connector,
 		return;
 
 	sde_connector_get_info(connector, &info);
-	if (c_conn->ops.check_status &&
-		(info.capabilities & MSM_DISPLAY_ESD_ENABLED)) {
+	if ((c_conn->ops.force_esd_disable &&
+		(c_conn->ops.force_esd_disable(c_conn->display) == false)) &&
+		(c_conn->ops.check_status &&
+		(info.capabilities & MSM_DISPLAY_ESD_ENABLED))) {
 		if (en) {
 			u32 interval;
 
diff --git a/msm/sde/sde_connector.h b/msm/sde/sde_connector.h
index 44a1fc689492..c2c21428e453 100644
--- a/msm/sde/sde_connector.h
+++ b/msm/sde/sde_connector.h
@@ -277,6 +277,13 @@ struct sde_connector_ops {
 	int (*motUtil_transfer)(void *display, const char *cmd_buf,
 			u32 cmd_buf_len, struct motUtil *motUtil_data);
 
+	/**
+	 * force_esd_disable - force to disable check_status
+	 * @display: Pointer to private display handle
+	 * Returns: true for forcing ESD disable
+	 */
+	bool (*force_esd_disable)(void *display);
+
 	/**
 	 * config_hdr - configure HDR
 	 * @connector: Pointer to drm connector structure
diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c
index 9701fdb4a098..4ba78711d45d 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -1437,6 +1437,7 @@ static int _sde_kms_setup_displays(struct drm_device *dev,
 		.enable_event = dsi_conn_enable_event,
 		.motUtil_transfer = dsi_display_motUtil_transfer,
 		.cmd_transfer = dsi_display_cmd_transfer,
+		.force_esd_disable = dsi_display_force_esd_disable,
 		.cont_splash_config = dsi_display_cont_splash_config,
 		.get_panel_vfp = dsi_display_get_panel_vfp,
 		.get_default_lms = dsi_display_get_default_lms,
@@ -1454,6 +1455,7 @@ static int _sde_kms_setup_displays(struct drm_device *dev,
 		.get_dst_format = NULL,
 		.check_status = NULL,
 		.cmd_transfer = NULL,
+		.force_esd_disable = NULL,
 		.cont_splash_config = NULL,
 		.get_panel_vfp = NULL,
 	};
@@ -1471,6 +1473,7 @@ static int _sde_kms_setup_displays(struct drm_device *dev,
 		.set_colorspace = dp_connector_set_colorspace,
 		.config_hdr = dp_connector_config_hdr,
 		.cmd_transfer = NULL,
+		.force_esd_disable = NULL,
 		.cont_splash_config = NULL,
 		.get_panel_vfp = NULL,
 		.update_pps = dp_connector_update_pps,