From aedd309e713e69321bb3cd42084e089c70e54e95 Mon Sep 17 00:00:00 2001
From: Anjaneya Prasad Musunuri <aprasad@codeaurora.org>
Date: Wed, 1 Sep 2021 12:04:04 +0530
Subject: [PATCH 01/94] disp: msm: sde: clear partial update mask during last
 close

Clear partial update mask during last close to avoid
rounded corner to be programmed without valid mask during
shell stop/start operations.

Change-Id: I378adc62b5bc5913abfc32fa3528c8e28ea273d4
Signed-off-by: Anjaneya Prasad Musunuri <aprasad@codeaurora.org>
---
 msm/sde/sde_color_processing.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/msm/sde/sde_color_processing.c b/msm/sde/sde_color_processing.c
index 4cf87d4dca96..8c40e4950080 100644
--- a/msm/sde/sde_color_processing.c
+++ b/msm/sde/sde_color_processing.c
@@ -2159,6 +2159,7 @@ void sde_cp_crtc_clear(struct drm_crtc *crtc)
 	list_del_init(&sde_crtc->dirty_list);
 	list_del_init(&sde_crtc->ad_active);
 	list_del_init(&sde_crtc->ad_dirty);
+	sde_crtc->cp_pu_feature_mask = 0;
 	mutex_unlock(&sde_crtc->crtc_cp_lock);
 
 	spin_lock_irqsave(&sde_crtc->spin_lock, flags);

From 99041a16f221d747049f0e250ad628b04aada527 Mon Sep 17 00:00:00 2001
From: Anjaneya Prasad Musunuri <aprasad@codeaurora.org>
Date: Thu, 16 Sep 2021 20:05:03 +0530
Subject: [PATCH 02/94] disp: msm: sde: handle partial update transitions in
 rounded corner

This change handles partial update use case transitions. Rounded
corner should be programmed to full ROI when transitioning out of
partial update use case.
This change also clear cached ROIs when rounded corner feature is
disabled to ensure full frame ROI for first frame when feature
is enabled again.

Change-Id: I4c48ccd3f64409d1b0fa19f0e6f92eab5f86d099
Signed-off-by: Anjaneya Prasad Musunuri <aprasad@codeaurora.org>
---
 msm/sde/sde_color_processing.c | 59 +++++++++++++++++++++++++---------
 msm/sde/sde_hw_rc.c            |  5 +++
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/msm/sde/sde_color_processing.c b/msm/sde/sde_color_processing.c
index 8c40e4950080..d6c60de70ffe 100644
--- a/msm/sde/sde_color_processing.c
+++ b/msm/sde/sde_color_processing.c
@@ -210,15 +210,37 @@ static struct sde_kms *get_kms(struct drm_crtc *crtc)
 static void update_pu_feature_enable(struct sde_crtc *sde_crtc,
 		u32 feature, bool enable)
 {
+	struct drm_crtc *crtc;
+	struct sde_crtc_state *sde_crtc_state;
+
 	if (!sde_crtc || feature > SDE_CP_CRTC_MAX_PU_FEATURES) {
 		DRM_ERROR("invalid args feature %d\n", feature);
 		return;
 	}
 
+	crtc = &(sde_crtc->base);
+	if (!crtc) {
+		DRM_ERROR("invalid crtc pointer\n");
+		return;
+	}
+
+	sde_crtc_state = to_sde_crtc_state(crtc->state);
+	if (!sde_crtc_state) {
+		DRM_ERROR("invalid sde_crtc_state pointer\n");
+		return;
+	}
+
 	if (enable)
 		sde_crtc->cp_pu_feature_mask |= BIT(feature);
 	else
 		sde_crtc->cp_pu_feature_mask &= ~BIT(feature);
+
+	/* clear cached ROI list when feature is disabled */
+	if ((sde_crtc->cp_pu_feature_mask == 0) &&
+		(sde_crtc_state->cached_user_roi_list.num_rects != 0)) {
+		memset(&sde_crtc_state->cached_user_roi_list, 0,
+				sizeof(struct msm_roi_list));
+	}
 }
 
 static int set_dspp_vlut_feature(struct sde_hw_dspp *hw_dspp,
@@ -1675,27 +1697,32 @@ static int sde_cp_crtc_set_pu_features(struct drm_crtc *crtc, bool *need_flush)
 	}
 
 	/* early return if not a partial update frame or no change in rois */
-	if (sde_crtc_state->user_roi_list.num_rects == 0) {
+	if ((sde_crtc_state->user_roi_list.num_rects == 0) &&
+		(sde_crtc_state->cached_user_roi_list.num_rects == 0)) {
 		DRM_DEBUG_DRIVER("no partial update required\n");
+		return 0;
+	} else if (sde_crtc_state->user_roi_list.num_rects == 0) {
+		DRM_DEBUG_DRIVER("transition from PU to full update\n");
 		memset(&sde_crtc_state->cached_user_roi_list, 0,
 				sizeof(struct msm_roi_list));
-		return 0;
-	}
-
-	sde_kms_rect_merge_rectangles(&sde_crtc_state->user_roi_list,
-			&user_rect);
-	sde_kms_rect_merge_rectangles(&sde_crtc_state->cached_user_roi_list,
-			&cached_rect);
-	if (sde_kms_rect_is_equal(&user_rect, &cached_rect)) {
-		DRM_DEBUG_DRIVER("no change in list of ROIs\n");
-		return 0;
+	} else {
+		sde_kms_rect_merge_rectangles(&sde_crtc_state->user_roi_list,
+				&user_rect);
+		sde_kms_rect_merge_rectangles(
+				&sde_crtc_state->cached_user_roi_list,
+				&cached_rect);
+		if (sde_kms_rect_is_equal(&user_rect, &cached_rect)) {
+			DRM_DEBUG_DRIVER("no change in list of ROIs\n");
+			return 0;
+		}
 	}
 
 	catalog = get_kms(&sde_crtc->base)->catalog;
 	memset(&hw_cfg, 0, sizeof(hw_cfg));
 	hw_cfg.num_of_mixers = sde_crtc->num_mixers;
 	hw_cfg.broadcast_disabled = catalog->dma_cfg.broadcast_disabled;
-	hw_cfg.payload = &sde_crtc_state->user_roi_list;
+	hw_cfg.payload = (sde_crtc_state->user_roi_list.num_rects) ?
+		&sde_crtc_state->user_roi_list : NULL;
 	hw_cfg.len = sizeof(sde_crtc_state->user_roi_list);
 	for (i = 0; i < hw_cfg.num_of_mixers; i++)
 		hw_cfg.dspp[i] = sde_crtc->mixers[i].hw_dspp;
@@ -1730,9 +1757,11 @@ static int sde_cp_crtc_set_pu_features(struct drm_crtc *crtc, bool *need_flush)
 		}
 	}
 
-	memcpy(&sde_crtc_state->cached_user_roi_list,
-			&sde_crtc_state->user_roi_list,
-			sizeof(struct msm_roi_list));
+	if (sde_crtc_state->user_roi_list.num_rects != 0) {
+		memcpy(&sde_crtc_state->cached_user_roi_list,
+				&sde_crtc_state->user_roi_list,
+				sizeof(struct msm_roi_list));
+	}
 
 	return 0;
 }
diff --git a/msm/sde/sde_hw_rc.c b/msm/sde/sde_hw_rc.c
index bcf3f30a4a08..38106898b2f2 100644
--- a/msm/sde/sde_hw_rc.c
+++ b/msm/sde/sde_hw_rc.c
@@ -775,6 +775,7 @@ int sde_hw_rc_check_pu_roi(struct sde_hw_dspp *hw_dspp, void *cfg)
 	roi_list = hw_cfg->payload;
 	if (!roi_list) {
 		SDE_DEBUG("full frame update\n");
+		memset(&empty_roi_list, 0, sizeof(struct msm_roi_list));
 		roi_list = &empty_roi_list;
 	}
 
@@ -837,6 +838,7 @@ int sde_hw_rc_setup_pu_roi(struct sde_hw_dspp *hw_dspp, void *cfg)
 	roi_list = hw_cfg->payload;
 	if (!roi_list) {
 		SDE_DEBUG("full frame update\n");
+		memset(&empty_roi_list, 0, sizeof(struct msm_roi_list));
 		roi_list = &empty_roi_list;
 	}
 
@@ -906,6 +908,9 @@ int sde_hw_rc_setup_mask(struct sde_hw_dspp *hw_dspp, void *cfg)
 		memset(RC_STATE(hw_dspp).last_rc_mask_cfg, 0,
 				sizeof(struct drm_msm_rc_mask_cfg));
 		RC_STATE(hw_dspp).mask_programmed = false;
+		memset(RC_STATE(hw_dspp).last_roi_list, 0,
+				sizeof(struct msm_roi_list));
+		RC_STATE(hw_dspp).roi_programmed = false;
 
 		return 0;
 	}

From 7f067beb2820a413d967f131651460e730f83dfc Mon Sep 17 00:00:00 2001
From: Pawan Chilka <pchilka@codeaurora.org>
Date: Thu, 30 Sep 2021 15:23:04 +0530
Subject: [PATCH 03/94] Revert "disp: msm: sde: handle partial update
 transitions in rounded corner".

This reverts commit 99041a16f221d747049f0e250ad628b04aada527.

Change-Id: I332ba310680fb173d234c54feda29656ea44a0d1
---
 msm/sde/sde_color_processing.c | 59 +++++++++-------------------------
 msm/sde/sde_hw_rc.c            |  5 ---
 2 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/msm/sde/sde_color_processing.c b/msm/sde/sde_color_processing.c
index d6c60de70ffe..8c40e4950080 100644
--- a/msm/sde/sde_color_processing.c
+++ b/msm/sde/sde_color_processing.c
@@ -210,37 +210,15 @@ static struct sde_kms *get_kms(struct drm_crtc *crtc)
 static void update_pu_feature_enable(struct sde_crtc *sde_crtc,
 		u32 feature, bool enable)
 {
-	struct drm_crtc *crtc;
-	struct sde_crtc_state *sde_crtc_state;
-
 	if (!sde_crtc || feature > SDE_CP_CRTC_MAX_PU_FEATURES) {
 		DRM_ERROR("invalid args feature %d\n", feature);
 		return;
 	}
 
-	crtc = &(sde_crtc->base);
-	if (!crtc) {
-		DRM_ERROR("invalid crtc pointer\n");
-		return;
-	}
-
-	sde_crtc_state = to_sde_crtc_state(crtc->state);
-	if (!sde_crtc_state) {
-		DRM_ERROR("invalid sde_crtc_state pointer\n");
-		return;
-	}
-
 	if (enable)
 		sde_crtc->cp_pu_feature_mask |= BIT(feature);
 	else
 		sde_crtc->cp_pu_feature_mask &= ~BIT(feature);
-
-	/* clear cached ROI list when feature is disabled */
-	if ((sde_crtc->cp_pu_feature_mask == 0) &&
-		(sde_crtc_state->cached_user_roi_list.num_rects != 0)) {
-		memset(&sde_crtc_state->cached_user_roi_list, 0,
-				sizeof(struct msm_roi_list));
-	}
 }
 
 static int set_dspp_vlut_feature(struct sde_hw_dspp *hw_dspp,
@@ -1697,32 +1675,27 @@ static int sde_cp_crtc_set_pu_features(struct drm_crtc *crtc, bool *need_flush)
 	}
 
 	/* early return if not a partial update frame or no change in rois */
-	if ((sde_crtc_state->user_roi_list.num_rects == 0) &&
-		(sde_crtc_state->cached_user_roi_list.num_rects == 0)) {
+	if (sde_crtc_state->user_roi_list.num_rects == 0) {
 		DRM_DEBUG_DRIVER("no partial update required\n");
-		return 0;
-	} else if (sde_crtc_state->user_roi_list.num_rects == 0) {
-		DRM_DEBUG_DRIVER("transition from PU to full update\n");
 		memset(&sde_crtc_state->cached_user_roi_list, 0,
 				sizeof(struct msm_roi_list));
-	} else {
-		sde_kms_rect_merge_rectangles(&sde_crtc_state->user_roi_list,
-				&user_rect);
-		sde_kms_rect_merge_rectangles(
-				&sde_crtc_state->cached_user_roi_list,
-				&cached_rect);
-		if (sde_kms_rect_is_equal(&user_rect, &cached_rect)) {
-			DRM_DEBUG_DRIVER("no change in list of ROIs\n");
-			return 0;
-		}
+		return 0;
+	}
+
+	sde_kms_rect_merge_rectangles(&sde_crtc_state->user_roi_list,
+			&user_rect);
+	sde_kms_rect_merge_rectangles(&sde_crtc_state->cached_user_roi_list,
+			&cached_rect);
+	if (sde_kms_rect_is_equal(&user_rect, &cached_rect)) {
+		DRM_DEBUG_DRIVER("no change in list of ROIs\n");
+		return 0;
 	}
 
 	catalog = get_kms(&sde_crtc->base)->catalog;
 	memset(&hw_cfg, 0, sizeof(hw_cfg));
 	hw_cfg.num_of_mixers = sde_crtc->num_mixers;
 	hw_cfg.broadcast_disabled = catalog->dma_cfg.broadcast_disabled;
-	hw_cfg.payload = (sde_crtc_state->user_roi_list.num_rects) ?
-		&sde_crtc_state->user_roi_list : NULL;
+	hw_cfg.payload = &sde_crtc_state->user_roi_list;
 	hw_cfg.len = sizeof(sde_crtc_state->user_roi_list);
 	for (i = 0; i < hw_cfg.num_of_mixers; i++)
 		hw_cfg.dspp[i] = sde_crtc->mixers[i].hw_dspp;
@@ -1757,11 +1730,9 @@ static int sde_cp_crtc_set_pu_features(struct drm_crtc *crtc, bool *need_flush)
 		}
 	}
 
-	if (sde_crtc_state->user_roi_list.num_rects != 0) {
-		memcpy(&sde_crtc_state->cached_user_roi_list,
-				&sde_crtc_state->user_roi_list,
-				sizeof(struct msm_roi_list));
-	}
+	memcpy(&sde_crtc_state->cached_user_roi_list,
+			&sde_crtc_state->user_roi_list,
+			sizeof(struct msm_roi_list));
 
 	return 0;
 }
diff --git a/msm/sde/sde_hw_rc.c b/msm/sde/sde_hw_rc.c
index 38106898b2f2..bcf3f30a4a08 100644
--- a/msm/sde/sde_hw_rc.c
+++ b/msm/sde/sde_hw_rc.c
@@ -775,7 +775,6 @@ int sde_hw_rc_check_pu_roi(struct sde_hw_dspp *hw_dspp, void *cfg)
 	roi_list = hw_cfg->payload;
 	if (!roi_list) {
 		SDE_DEBUG("full frame update\n");
-		memset(&empty_roi_list, 0, sizeof(struct msm_roi_list));
 		roi_list = &empty_roi_list;
 	}
 
@@ -838,7 +837,6 @@ int sde_hw_rc_setup_pu_roi(struct sde_hw_dspp *hw_dspp, void *cfg)
 	roi_list = hw_cfg->payload;
 	if (!roi_list) {
 		SDE_DEBUG("full frame update\n");
-		memset(&empty_roi_list, 0, sizeof(struct msm_roi_list));
 		roi_list = &empty_roi_list;
 	}
 
@@ -908,9 +906,6 @@ int sde_hw_rc_setup_mask(struct sde_hw_dspp *hw_dspp, void *cfg)
 		memset(RC_STATE(hw_dspp).last_rc_mask_cfg, 0,
 				sizeof(struct drm_msm_rc_mask_cfg));
 		RC_STATE(hw_dspp).mask_programmed = false;
-		memset(RC_STATE(hw_dspp).last_roi_list, 0,
-				sizeof(struct msm_roi_list));
-		RC_STATE(hw_dspp).roi_programmed = false;
 
 		return 0;
 	}

From 1a0d14dd152338e53935abac785b7552eda2da9c Mon Sep 17 00:00:00 2001
From: Pawan Chilka <pchilka@codeaurora.org>
Date: Tue, 5 Oct 2021 16:33:02 +0530
Subject: [PATCH 04/94] disp: msm: sde: handle partial update transitions in
 rounded corner.

This change handles partial update use case transitions. Rounded
corner should be programmed to full ROI when transitioning out of
partial update use case.
This change also clear cached ROIs when rounded corner feature is
disabled to ensure full frame ROI for first frame when feature
is enabled again. This change depends on HAL change to disable PU
for one frame when RC mask config is set.
This change also moves cached rectangles from crtc state to crtc
structure to avoid cached rectangles being incorrect due to race
conditions between updating cached rectangles in crtc state and
duplicating crtc state when next commit starts.

Change-Id: I4c48ccd3f64409d1b0fa19f0e6f92eab5f86d069
Signed-off-by: Anjaneya Prasad Musunuri <aprasad@codeaurora.org>
---
 msm/sde/sde_color_processing.c | 39 ++++++++++++++++++++--------------
 msm/sde/sde_crtc.h             |  7 +++---
 msm/sde/sde_hw_rc.c            |  5 +++++
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/msm/sde/sde_color_processing.c b/msm/sde/sde_color_processing.c
index 8c40e4950080..799dfdd4495d 100644
--- a/msm/sde/sde_color_processing.c
+++ b/msm/sde/sde_color_processing.c
@@ -1675,27 +1675,32 @@ static int sde_cp_crtc_set_pu_features(struct drm_crtc *crtc, bool *need_flush)
 	}
 
 	/* early return if not a partial update frame or no change in rois */
-	if (sde_crtc_state->user_roi_list.num_rects == 0) {
+	if ((sde_crtc_state->user_roi_list.num_rects == 0) &&
+		(sde_crtc->cached_user_roi_list.num_rects == 0)) {
 		DRM_DEBUG_DRIVER("no partial update required\n");
-		memset(&sde_crtc_state->cached_user_roi_list, 0,
+		return 0;
+	} else if (sde_crtc_state->user_roi_list.num_rects == 0) {
+		DRM_DEBUG_DRIVER("transition from PU to full update\n");
+		memset(&sde_crtc->cached_user_roi_list, 0,
 				sizeof(struct msm_roi_list));
-		return 0;
-	}
-
-	sde_kms_rect_merge_rectangles(&sde_crtc_state->user_roi_list,
-			&user_rect);
-	sde_kms_rect_merge_rectangles(&sde_crtc_state->cached_user_roi_list,
-			&cached_rect);
-	if (sde_kms_rect_is_equal(&user_rect, &cached_rect)) {
-		DRM_DEBUG_DRIVER("no change in list of ROIs\n");
-		return 0;
+	} else {
+		sde_kms_rect_merge_rectangles(&sde_crtc_state->user_roi_list,
+				&user_rect);
+		sde_kms_rect_merge_rectangles(
+				&sde_crtc->cached_user_roi_list,
+				&cached_rect);
+		if (sde_kms_rect_is_equal(&user_rect, &cached_rect)) {
+			DRM_DEBUG_DRIVER("no change in list of ROIs\n");
+			return 0;
+		}
 	}
 
 	catalog = get_kms(&sde_crtc->base)->catalog;
 	memset(&hw_cfg, 0, sizeof(hw_cfg));
 	hw_cfg.num_of_mixers = sde_crtc->num_mixers;
 	hw_cfg.broadcast_disabled = catalog->dma_cfg.broadcast_disabled;
-	hw_cfg.payload = &sde_crtc_state->user_roi_list;
+	hw_cfg.payload = (sde_crtc_state->user_roi_list.num_rects) ?
+		&sde_crtc_state->user_roi_list : NULL;
 	hw_cfg.len = sizeof(sde_crtc_state->user_roi_list);
 	for (i = 0; i < hw_cfg.num_of_mixers; i++)
 		hw_cfg.dspp[i] = sde_crtc->mixers[i].hw_dspp;
@@ -1730,9 +1735,11 @@ static int sde_cp_crtc_set_pu_features(struct drm_crtc *crtc, bool *need_flush)
 		}
 	}
 
-	memcpy(&sde_crtc_state->cached_user_roi_list,
-			&sde_crtc_state->user_roi_list,
-			sizeof(struct msm_roi_list));
+	if (sde_crtc_state->user_roi_list.num_rects != 0) {
+		memcpy(&sde_crtc->cached_user_roi_list,
+				&sde_crtc_state->user_roi_list,
+				sizeof(struct msm_roi_list));
+	}
 
 	return 0;
 }
diff --git a/msm/sde/sde_crtc.h b/msm/sde/sde_crtc.h
index da1aa8b6c6f5..bd16cd3da6fe 100644
--- a/msm/sde/sde_crtc.h
+++ b/msm/sde/sde_crtc.h
@@ -277,6 +277,7 @@ struct sde_crtc_misr_info {
  * @plane_mask_old: keeps track of the planes used in the previous commit
  * @frame_trigger_mode: frame trigger mode
  * @cp_pu_feature_mask: mask indicating cp feature enable for partial update
+ * @cached_user_roi_list : Copy of user_roi_list from previous PU frame
  * @ltm_buffer_cnt  : number of ltm buffers
  * @ltm_buffers     : struct stores ltm buffer related data
  * @ltm_buf_free    : list of LTM buffers that are available
@@ -361,6 +362,7 @@ struct sde_crtc {
 	enum frame_trigger_mode_type frame_trigger_mode;
 
 	u32 cp_pu_feature_mask;
+	struct msm_roi_list cached_user_roi_list;
 
 	u32 ltm_buffer_cnt;
 	struct sde_ltm_buffer *ltm_buffers[LTM_BUFFER_SIZE];
@@ -395,8 +397,7 @@ struct sde_crtc {
  * @lm_roi        : Current LM ROI, possibly sub-rectangle of mode.
  *                  Origin top left of CRTC.
  * @user_roi_list : List of user's requested ROIs as from set property
- * @cached_user_roi_list : Copy of user_roi_list from previous PU frame
- * @property_state: Local storage for msm_prop properties
+  * @property_state: Local storage for msm_prop properties
  * @property_values: Current crtc property values
  * @input_fence_timeout_ns : Cached input fence timeout, in ns
  * @num_dim_layers: Number of dim layers
@@ -423,7 +424,7 @@ struct sde_crtc_state {
 	struct sde_rect crtc_roi;
 	struct sde_rect lm_bounds[CRTC_DUAL_MIXERS];
 	struct sde_rect lm_roi[CRTC_DUAL_MIXERS];
-	struct msm_roi_list user_roi_list, cached_user_roi_list;
+	struct msm_roi_list user_roi_list;
 
 	struct msm_property_state property_state;
 	struct msm_property_value property_values[CRTC_PROP_COUNT];
diff --git a/msm/sde/sde_hw_rc.c b/msm/sde/sde_hw_rc.c
index bcf3f30a4a08..38106898b2f2 100644
--- a/msm/sde/sde_hw_rc.c
+++ b/msm/sde/sde_hw_rc.c
@@ -775,6 +775,7 @@ int sde_hw_rc_check_pu_roi(struct sde_hw_dspp *hw_dspp, void *cfg)
 	roi_list = hw_cfg->payload;
 	if (!roi_list) {
 		SDE_DEBUG("full frame update\n");
+		memset(&empty_roi_list, 0, sizeof(struct msm_roi_list));
 		roi_list = &empty_roi_list;
 	}
 
@@ -837,6 +838,7 @@ int sde_hw_rc_setup_pu_roi(struct sde_hw_dspp *hw_dspp, void *cfg)
 	roi_list = hw_cfg->payload;
 	if (!roi_list) {
 		SDE_DEBUG("full frame update\n");
+		memset(&empty_roi_list, 0, sizeof(struct msm_roi_list));
 		roi_list = &empty_roi_list;
 	}
 
@@ -906,6 +908,9 @@ int sde_hw_rc_setup_mask(struct sde_hw_dspp *hw_dspp, void *cfg)
 		memset(RC_STATE(hw_dspp).last_rc_mask_cfg, 0,
 				sizeof(struct drm_msm_rc_mask_cfg));
 		RC_STATE(hw_dspp).mask_programmed = false;
+		memset(RC_STATE(hw_dspp).last_roi_list, 0,
+				sizeof(struct msm_roi_list));
+		RC_STATE(hw_dspp).roi_programmed = false;
 
 		return 0;
 	}

From 971ffaef06920ab3ea61a60056a953fa06b2cad5 Mon Sep 17 00:00:00 2001
From: Raghavendra Ambadas <quic_c_rambad@quicinc.com>
Date: Thu, 27 Jan 2022 15:18:47 +0530
Subject: [PATCH 05/94] disp: msm: sde: synx: Add quic copyright

Change fixes adding quic copyright as instructed.

Change-Id: I2331492b78c013969fa1d48e9ab9afdb03e2f999
Signed-off-by: Raghavendra Ambadas <quic_c_rambad@quicinc.com>
---
 msm/sde/sde_crtc.c    | 3 ++-
 msm/sde/sde_encoder.c | 3 ++-
 msm/sde/sde_encoder.h | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c
index c3b828525897..86b38a6999d2 100644
--- a/msm/sde/sde_crtc.c
+++ b/msm/sde/sde_crtc.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2022 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (C) 2013 Red Hat
  * Author: Rob Clark <robdclark@gmail.com>
  *
diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c
index 733bad19992a..71bbeaf7b01a 100644
--- a/msm/sde/sde_encoder.c
+++ b/msm/sde/sde_encoder.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2014-2022, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (C) 2013 Red Hat
  * Author: Rob Clark <robdclark@gmail.com>
  *
diff --git a/msm/sde/sde_encoder.h b/msm/sde/sde_encoder.h
index 0306459c4fd6..ebee140da628 100644
--- a/msm/sde/sde_encoder.h
+++ b/msm/sde/sde_encoder.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2015-2022, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (C) 2013 Red Hat
  * Author: Rob Clark <robdclark@gmail.com>
  *

From fac316f8af5d5fb7d2f71f5161f65a74c95cb43a Mon Sep 17 00:00:00 2001
From: dengwei1 <dengwei1@motorola.com>
Date: Sat, 7 Mar 2020 20:10:47 +0800
Subject: [PATCH 06/94] input add touch support

touch init
himax ic

Change-Id: I260085bd4397089ca1c865e601c9ece4f87b75bc
Signed-off-by: dengwei1 <dengwei1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1508817
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index e1f231f13c00..6ed5910015a6 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -733,12 +733,23 @@ static int dsi_panel_update_pwm_backlight(struct dsi_panel *panel,
 error:
 	return rc;
 }
-
+//temp solution for TP, tinno 20200229 start
+#include <linux/notifier.h>
+BLOCKING_NOTIFIER_HEAD(backlight_state_notifier_list);
+//temp solution for TP, tinno 20200229 end
 int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 {
 	int rc = 0;
 	struct dsi_backlight_config *bl = &panel->bl_config;
 
+//temp solution for TP, tinno 20200229 start
+	static u32 last_bl_lvl = 0;
+	if ((bl_lvl == 0) || (last_bl_lvl == 0))
+	{
+		blocking_notifier_call_chain(&backlight_state_notifier_list, bl_lvl, NULL);
+	}
+	last_bl_lvl = bl_lvl;
+//temp solution for TP, tinno 20200229 end
 	if (panel->host_config.ext_bridge_mode)
 		return 0;
 

From aa252c3330549241da20ef1aaa2351d588cdb2ed Mon Sep 17 00:00:00 2001
From: dengwei1 <dengwei1@motorola.com>
Date: Wed, 11 Mar 2020 14:10:01 +0800
Subject: [PATCH 07/94] guam: input add drm support

input add drm
support

Change-Id: I156438665fb27d9a1f5afeaec11ef4fd736ea812
Signed-off-by: dengwei1 <dengwei1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1510616
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
 mode change 100644 => 100755 msm/dsi/dsi_panel.c

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
old mode 100644
new mode 100755
index 6ed5910015a6..e1f231f13c00
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -733,23 +733,12 @@ static int dsi_panel_update_pwm_backlight(struct dsi_panel *panel,
 error:
 	return rc;
 }
-//temp solution for TP, tinno 20200229 start
-#include <linux/notifier.h>
-BLOCKING_NOTIFIER_HEAD(backlight_state_notifier_list);
-//temp solution for TP, tinno 20200229 end
+
 int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 {
 	int rc = 0;
 	struct dsi_backlight_config *bl = &panel->bl_config;
 
-//temp solution for TP, tinno 20200229 start
-	static u32 last_bl_lvl = 0;
-	if ((bl_lvl == 0) || (last_bl_lvl == 0))
-	{
-		blocking_notifier_call_chain(&backlight_state_notifier_list, bl_lvl, NULL);
-	}
-	last_bl_lvl = bl_lvl;
-//temp solution for TP, tinno 20200229 end
 	if (panel->host_config.ext_bridge_mode)
 		return 0;
 

From 0ce5683cb1b69f57beb1b0899cac38564c696839 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 24 Jul 2019 08:05:26 -0500
Subject: [PATCH 08/94] disp: msm: dsi: Add support display 2bytes brightness.

Normal, there is a brightness level from 0-255 (1 byte), but some
panels are support 2 bytes for brightness, (0-1023).

Port from 68e0c10

Change-Id: Id948d3d97fb3611e458b18a3345cec6a64e5c034
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1410291
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509791
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 11 +++++++++++
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 12 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index e1f231f13c00..dfc04c74b5c1 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -677,6 +677,11 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	else
 		rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);
 
+	if (bl->bl_2bytes_enable)
+		rc = mipi_dsi_dcs_set_display_brightness_2bytes(dsi, bl_lvl);
+	else
+		rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);
+
 	if (rc < 0)
 		DSI_ERR("failed to update dcs backlight:%d\n", bl_lvl);
 
@@ -2419,6 +2424,12 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 	panel->bl_config.bl_inverted_dbv = utils->read_bool(utils->data,
 		"qcom,mdss-dsi-bl-inverted-dbv");
 
+	panel->bl_config.bl_2bytes_enable = utils->read_bool(utils->data,
+			"qcom,bklt-dcs-2bytes-enabled");
+
+	pr_info("[%s] bl_2bytes_enable=%d\n", panel->name,
+			panel->bl_config.bl_2bytes_enable);
+
 	if (panel->bl_config.type == DSI_BACKLIGHT_PWM) {
 		rc = dsi_panel_parse_bl_pwm_config(panel);
 		if (rc) {
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index ee30cd5375b4..e2742f2531c8 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -115,6 +115,7 @@ struct dsi_backlight_config {
 	enum dsi_backlight_type type;
 	enum bl_update_flag bl_update;
 
+	bool bl_2bytes_enable;
 	u32 bl_min_level;
 	u32 bl_max_level;
 	u32 brightness_max_level;

From 82dd11b2b6b8e8c7e82a7675af30b056af516cb5 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 24 Jul 2019 14:31:35 -0500
Subject: [PATCH 09/94] disp: msm: dsi: Add "bl_ctrl_dummy" to panel bl type

Add a new display's backlight type "bl_ctrl_dummy". With this
backlight type, the panel backlight driver will ignore any backlight
requests. This new backlight type will be used with a bare_board or
no-display configuration and the display driver doesn't need to have
any communication with panel.

Port from: cfb2acd

Change-Id: I2108d7477009d06ac350ca49c380b64c9d004f65
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1442424
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509792
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 9 +++++++++
 msm/dsi/dsi_panel.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index dfc04c74b5c1..c1f3b86d8595 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -755,6 +755,9 @@ int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 	case DSI_BACKLIGHT_DCS:
 		rc = dsi_panel_update_backlight(panel, bl_lvl);
 		break;
+	case DSI_BACKLIGHT_DUMMY:
+		rc = 0;
+		break;
 	case DSI_BACKLIGHT_EXTERNAL:
 		break;
 	case DSI_BACKLIGHT_PWM:
@@ -834,6 +837,8 @@ static int dsi_panel_bl_register(struct dsi_panel *panel)
 		break;
 	case DSI_BACKLIGHT_DCS:
 		break;
+	case DSI_BACKLIGHT_DUMMY:
+		break;
 	case DSI_BACKLIGHT_EXTERNAL:
 		break;
 	case DSI_BACKLIGHT_PWM:
@@ -869,6 +874,8 @@ static int dsi_panel_bl_unregister(struct dsi_panel *panel)
 		break;
 	case DSI_BACKLIGHT_DCS:
 		break;
+	case DSI_BACKLIGHT_DUMMY:
+		break;
 	case DSI_BACKLIGHT_EXTERNAL:
 		break;
 	case DSI_BACKLIGHT_PWM:
@@ -2361,6 +2368,8 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 		panel->bl_config.type = DSI_BACKLIGHT_WLED;
 	} else if (!strcmp(bl_type, "bl_ctrl_dcs")) {
 		panel->bl_config.type = DSI_BACKLIGHT_DCS;
+	} else if (!strcmp(bl_type, "bl_ctrl_dummy")) {
+		panel->bl_config.type = DSI_BACKLIGHT_DUMMY;
 	} else if (!strcmp(bl_type, "bl_ctrl_external")) {
 		panel->bl_config.type = DSI_BACKLIGHT_EXTERNAL;
 	} else {
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index e2742f2531c8..85ddad49a71d 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -46,6 +46,7 @@ enum dsi_backlight_type {
 	DSI_BACKLIGHT_PWM = 0,
 	DSI_BACKLIGHT_WLED,
 	DSI_BACKLIGHT_DCS,
+	DSI_BACKLIGHT_DUMMY,
 	DSI_BACKLIGHT_EXTERNAL,
 	DSI_BACKLIGHT_UNKNOWN,
 	DSI_BACKLIGHT_MAX,

From c4ac8db3fe6054de50da5f7917c6d75eedc7cc06 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 25 Jul 2019 10:11:43 -0500
Subject: [PATCH 10/94] disp: msm: dsi: add prints for DSI/panel turning off/on

Add some pr_info to indicate the DSI and panel are turning off
and on for ESD or black screen investigation.

Port from: 6fcdea6
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>

Change-Id: I334890799fd18be9951b8d7579717d362c9878c3
Reviewed-on: https://gerrit.mot.com/1444391
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509793
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c | 2 ++
 msm/dsi/dsi_panel.c   | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index acb1f7db43e1..8cece4f1a36e 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -7155,6 +7155,7 @@ int dsi_display_prepare(struct dsi_display *display)
 		return -EINVAL;
 	}
 
+	DSI_INFO("%s(%s)+\n", __func__, display->drm_conn->name);
 	SDE_EVT32(SDE_EVTLOG_FUNC_ENTRY);
 	mutex_lock(&display->display_lock);
 
@@ -7778,6 +7779,7 @@ int dsi_display_disable(struct dsi_display *display)
 		return -EINVAL;
 	}
 
+	DSI_INFO("%s(%s)+\n", __func__, display->drm_conn->name);
 	SDE_EVT32(SDE_EVTLOG_FUNC_ENTRY);
 	mutex_lock(&display->display_lock);
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index c1f3b86d8595..077b909be2a9 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -452,6 +452,7 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 {
 	int rc = 0;
 
+	DSI_INFO("%s(%s)+\n", __func__, panel->name);
 	rc = dsi_pwr_enable_regulator(&panel->power_info, true);
 	if (rc) {
 		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
@@ -493,6 +494,7 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 {
 	int rc = 0;
 
+	DSI_INFO("%s(%s)+\n", __func__, panel->name);
 	if (gpio_is_valid(panel->reset_config.disp_en_gpio))
 		gpio_set_value(panel->reset_config.disp_en_gpio, 0);
 
@@ -2436,7 +2438,7 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 	panel->bl_config.bl_2bytes_enable = utils->read_bool(utils->data,
 			"qcom,bklt-dcs-2bytes-enabled");
 
-	pr_info("[%s] bl_2bytes_enable=%d\n", panel->name,
+	DSI_INFO("[%s] bl_2bytes_enable=%d\n", panel->name,
 			panel->bl_config.bl_2bytes_enable);
 
 	if (panel->bl_config.type == DSI_BACKLIGHT_PWM) {
@@ -4482,6 +4484,7 @@ int dsi_panel_enable(struct dsi_panel *panel)
 		return -EINVAL;
 	}
 
+	DSI_INFO("%s(%s)+\n", __func__, panel->name);
 	mutex_lock(&panel->panel_lock);
 
 	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_ON);
@@ -4548,6 +4551,7 @@ int dsi_panel_disable(struct dsi_panel *panel)
 		return -EINVAL;
 	}
 
+	DSI_INFO("%s(%s)+\n", __func__, panel->name);
 	mutex_lock(&panel->panel_lock);
 
 	/* Avoid sending panel off commands when ESD recovery is underway */

From fb1d5e61d12791221346aafa82182d6db3f9b2cd Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 25 Jul 2019 10:15:12 -0500
Subject: [PATCH 11/94] disp: msm: sde: Change display ESD checking interval to
 8s

Change the ESD detection and recovery interval to 8 second

Port from: 1318dae

Change-Id: I530c74592941ff2cd68362224179d38df3ef8f60
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444392
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509794
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/sde/sde_kms.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/sde/sde_kms.h b/msm/sde/sde_kms.h
index 6882cdfdb00f..b9d9333f6a13 100644
--- a/msm/sde/sde_kms.h
+++ b/msm/sde/sde_kms.h
@@ -124,7 +124,7 @@
 #define SDE_KMS_OPS_PREPARE_PLANE_FB		BIT(3)
 
 /* ESD status check interval in miliseconds */
-#define STATUS_CHECK_INTERVAL_MS 5000
+#define STATUS_CHECK_INTERVAL_MS 8000
 
 /**
  * enum sde_kms_smmu_state:	smmu state

From 8072f67d7da86ef9fecf6a5270faec010e86c350 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 25 Jul 2019 12:56:02 -0500
Subject: [PATCH 12/94] disp: msm: dsi: parsing BL setting ESD and panel

After the Boot Loader (BL) detects the panel information, or reading
the ESD UTAG setting, the BL will write these information to the DTS.
The display driver from kernel and parse and save these setting.

Port from: 61c3e44

Change-Id: I3759b73c2e1eff01269a42dfa11d20807affa17a
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444393
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509795
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 48 +++++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  6 ++++++
 2 files changed, 54 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 077b909be2a9..f6409bf56f63 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -34,6 +34,9 @@
 #define DEFAULT_PANEL_PREFILL_LINES	25
 #define MIN_PREFILL_LINES      35
 
+#define DSI_PANEL_UNKNOWN_PANEL_NAME	"unknown"
+#define DSI_PANEL_PANEL_DEFAULT_VER 	0xffffffffffffffff
+
 enum dsi_dsc_ratio_type {
 	DSC_8BPC_8BPP,
 	DSC_10BPC_8BPP,
@@ -1500,6 +1503,45 @@ static int dsi_panel_parse_dyn_clk_caps(struct dsi_panel *panel)
 	return 0;
 }
 
+static int dsi_panel_parse_panel_cfg(struct dsi_panel *panel)
+{
+	struct device_node *np;
+	const char *pname;
+	u32 panel_ver, tmp;
+
+	np = of_find_node_by_path("/chosen");
+	/* Disable ESD only if the prop "mmi,esd" exists and is equal to 0 */
+	if (!of_property_read_u32(np, "mmi,esd", &tmp) && tmp == 0) {
+		panel->esd_utag_enable = false;
+		DSI_WARN("ESD detection is disabled by UTAGS\n");
+	} else
+		panel->esd_utag_enable = true;
+
+	panel->panel_ver = DSI_PANEL_PANEL_DEFAULT_VER;
+	of_property_read_u64(np, "mmi,panel_ver", &panel->panel_ver);
+
+	pname = of_get_property(np, "mmi,panel_name", NULL);
+	if (!pname || strlen(pname) == 0) {
+		DSI_WARN("Failed to get mmi,panel_name\n");
+		strlcpy(panel->panel_name, DSI_PANEL_UNKNOWN_PANEL_NAME,
+				sizeof(panel->panel_name));
+	} else
+		strlcpy(panel->panel_name, pname, sizeof(panel->panel_name));
+
+	DSI_DEBUG("esd_utage_enable=%d\n", panel->esd_utag_enable);
+
+	panel_ver = (u32)panel->panel_ver;
+	DSI_INFO("BL: panel = %s, manufacture_id(0xDA) = 0x%x controller_ver(0xDB) = 0x%x controller_drv_ver(0XDC) = 0x%x, full = 0x%016llx\n",
+		panel->panel_name,
+		panel_ver & 0xff, (panel_ver & 0xff00) >> 8,
+		(panel_ver & 0xff0000) >> 16,
+		panel->panel_ver);
+
+		of_node_put(np);
+
+	return 0;
+}
+
 static int dsi_panel_parse_dfps_caps(struct dsi_panel *panel)
 {
 	int rc = 0;
@@ -3434,6 +3476,12 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 		goto error;
 	}
 
+	rc = dsi_panel_parse_panel_cfg(panel);
+	if (rc) {
+		pr_err("failed to parse panel config from dts. rc=%d\n", rc);
+		goto error;
+	}
+
 	rc = dsi_panel_parse_dfps_caps(panel);
 	if (rc)
 		DSI_ERR("failed to parse dfps configuration, rc=%d\n", rc);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 85ddad49a71d..3f7593e0489c 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -28,6 +28,8 @@
 
 #define DSI_MODE_MAX 32
 
+#define DSI_PANEL_MAX_PANEL_LEN 256
+
 /*
  * Defining custom dsi msg flag,
  * continued from drm_mipi_dsi.h
@@ -227,6 +229,10 @@ struct dsi_panel {
 	int panel_test_gpio;
 	int power_mode;
 	enum dsi_panel_physical_type panel_type;
+
+	bool esd_utag_enable;
+	u64 panel_ver;
+	char panel_name[DSI_PANEL_MAX_PANEL_LEN];
 };
 
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)

From 88ab274b030634d556f43ebfb321c15887c5f22c Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 30 Jul 2019 13:45:53 -0500
Subject: [PATCH 13/94] disp: msm: dsi: Check panel's power_mode during resume

Check the panel's power_mode after it turns on, to see if the panel can turn
on correctly. If it doesn't not, then trigger the ESD recovery to fix it.

Port from: 0301a79

Change-Id: I7e6cdb099dd50559f570e201568479ba00aa0e66
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444394
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509796
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c |  34 ++++++++++++++
 msm/dsi/dsi_display.h |  14 ++++++
 msm/dsi/dsi_panel.c   | 103 ++++++++++++++++++++++++++++++++++++++++--
 msm/dsi/dsi_panel.h   |   3 ++
 4 files changed, 151 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 8cece4f1a36e..633dd3c5473b 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -697,6 +697,40 @@ exit:
 	return rc;
 }
 
+int dsi_display_cmd_mipi_transfer(struct dsi_display *display,
+				struct mipi_dsi_msg *msg,
+				u32 flags)
+{
+	int rc = 0;
+	struct dsi_display_ctrl *m_ctrl;
+
+	m_ctrl = &display->ctrl[display->cmd_master_idx];
+
+	if (display->tx_cmd_buf == NULL) {
+		rc = dsi_host_alloc_cmd_tx_buffer(display);
+		if (rc) {
+			DSI_ERR("failed to allocate cmd tx buffer memory\n");
+			goto done;
+		}
+	}
+
+	rc = dsi_display_cmd_engine_enable(display);
+	if (rc) {
+		DSI_ERR("cmd engine enable failed\n");
+		return -EPERM;
+	}
+
+	flags |= DSI_CTRL_CMD_FETCH_MEMORY | DSI_CTRL_CMD_CUSTOM_DMA_SCHED;
+	rc = dsi_ctrl_cmd_transfer(m_ctrl->ctrl, msg, &flags);
+	if (((flags & DSI_CTRL_CMD_READ) && rc <= 0) ||
+		(!(flags & DSI_CTRL_CMD_READ) && rc))
+		DSI_ERR("failed to transfer cmd. rc = %d\n", rc);
+
+	dsi_display_cmd_engine_disable(display);
+done:
+	return rc;
+}
+
 static int dsi_display_status_reg_read(struct dsi_display *display)
 {
 	int rc = 0, i;
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index d254dfe739bd..873c305497cf 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -718,6 +718,20 @@ enum dsi_pixel_format dsi_display_get_dst_format(
 		struct drm_connector *connector,
 		void *display);
 
+/*
+ * dsi_display_cmd_mipi_transfer() - Sending the MIPI DSI command
+ * @display:         Handle to display
+ * @msg:             MIPI DSI command information
+ * @flags:           Modifier flags
+ * Return: if this is a MIPI DSI read then it will return number read byte
+ *                                in success case. Otherwise will be "<=0"
+ *         if this is a MIPI DSI write then it will return "0" for success
+ *
+ */
+int dsi_display_cmd_mipi_transfer(struct dsi_display *display,
+		struct mipi_dsi_msg *msg,
+		u32 flags);
+
 /**
  * dsi_display_cont_splash_config() - initialize splash resources
  * @display:         Handle to display
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index f6409bf56f63..e2868f083dfe 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -11,6 +11,7 @@
 #include <linux/pwm.h>
 #include <video/mipi_display.h>
 
+#include "dsi_display.h"
 #include "dsi_panel.h"
 #include "dsi_ctrl_hw.h"
 #include "dsi_parser.h"
@@ -3427,6 +3428,76 @@ end:
 	utils->node = panel->panel_of_node;
 }
 
+static int dsi_panel_parse_mot_panel_config(struct dsi_panel *panel,
+					struct device_node *of_node)
+{
+	int rc;
+	struct drm_panel_esd_config *esd_config = &panel->esd_config;
+
+	rc = of_property_read_u32(of_node,
+			"qcom,mdss-dsi-panel-on-check-value",
+			&panel->disp_on_chk_val);
+	if (rc) {
+		/*
+		 * No panel_on_chk_val is configured in dts, then check for ESD
+		 * setting */
+		if ((esd_config->status_cmd.count == 1) &&
+				(esd_config->status_value) &&
+				(esd_config->status_value[0] != 0)) {
+			panel->disp_on_chk_val = esd_config->status_value[0];
+			DSI_INFO("disp_on_chk_val is set with ESD's chk value\n");
+		 } else {
+			DSI_INFO("hardcode disp_on_chk_val\n");
+			panel->disp_on_chk_val = 0x9c;
+		}
+	} else
+		DSI_INFO("disp_on_chk_val = 0x%x is defined\n",
+					panel->disp_on_chk_val);
+
+	panel->no_panel_on_read_support = of_property_read_bool(of_node,
+				"qcom,mdss-dsi-no-panel-on-read-support");
+	return rc;
+}
+
+static int dsi_panel_get_pwr_mode(struct dsi_panel *panel, u8 *val)
+{
+	int rc = 0;
+	struct dsi_cmd_desc cmd;
+	struct dsi_display *display = NULL;
+	u32 flags;
+	u8 payload = MIPI_DCS_GET_POWER_MODE;
+
+	display = container_of(panel->host, struct dsi_display, host);
+	if (!display) {
+		DSI_ERR("failed to retrieve display handle\n", display);
+		rc = -EINVAL;
+		goto end;
+	}
+
+	memset(&cmd, 0x00, sizeof(struct dsi_cmd_desc));
+	flags = DSI_CTRL_CMD_READ;
+
+	cmd.msg.type = MIPI_DSI_DCS_READ;
+	cmd.last_command = 1;
+	cmd.msg.flags = MIPI_DSI_MSG_LASTCOMMAND;
+	cmd.msg.channel = 0;
+
+	cmd.msg.tx_len = 1;
+	cmd.msg.tx_buf = &payload;
+	cmd.msg.rx_len = 1;
+	cmd.msg.rx_buf = val;
+
+	rc = dsi_display_cmd_mipi_transfer(display, &cmd.msg, flags);
+	if (rc <= 0) {
+		DSI_ERR("Failed to call dsi_display_cmd_transfer. rc=%d\n", rc);
+		rc = -EIO;
+	} else
+		rc = 0;
+end:
+	return rc;
+
+}
+
 struct dsi_panel *dsi_panel_get(struct device *parent,
 				struct device_node *of_node,
 				struct device_node *parser_node,
@@ -3462,6 +3533,11 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 				"qcom,mdss-dsi-panel-physical-type", NULL);
 	if (panel_physical_type && !strcmp(panel_physical_type, "oled"))
 		panel->panel_type = DSI_DISPLAY_PANEL_TYPE_OLED;
+
+	rc = dsi_panel_parse_mot_panel_config(panel, of_node);
+	if (rc)
+		DSI_DEBUG("failed to parse mot_panel_config, rc = %d\n", rc);
+
 	rc = dsi_panel_parse_host_config(panel);
 	if (rc) {
 		DSI_ERR("failed to parse host configuration, rc=%d\n",
@@ -4526,6 +4602,7 @@ int dsi_panel_post_switch(struct dsi_panel *panel)
 int dsi_panel_enable(struct dsi_panel *panel)
 {
 	int rc = 0;
+	u8 pwr_mode;
 
 	if (!panel) {
 		DSI_ERR("Invalid params\n");
@@ -4536,11 +4613,31 @@ int dsi_panel_enable(struct dsi_panel *panel)
 	mutex_lock(&panel->panel_lock);
 
 	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_ON);
-	if (rc)
+	if (rc) {
 		DSI_ERR("[%s] failed to send DSI_CMD_SET_ON cmds, rc=%d\n",
 		       panel->name, rc);
-	else
-		panel->panel_initialized = true;
+		goto err;
+	}
+
+	if (!panel->no_panel_on_read_support) {
+		rc = dsi_panel_get_pwr_mode(panel, &pwr_mode);
+		if (rc) {
+			DSI_ERR("[%s] Failed to read pwr_mode, rc = %d",
+					panel->name, rc);
+			goto err;
+		}
+
+		if (pwr_mode != panel->disp_on_chk_val) {
+			DSI_ERR("%s: Read Pwr_mode=0%x is not matched with expected value =0x%x\n",
+				__func__, pwr_mode, panel->disp_on_chk_val);
+		} else
+			DSI_INFO("-. Pwr_mode(0x0A) = 0x%x\n", pwr_mode);
+	} else
+		DSI_INFO("-: no_panel_on_read_support is set\n");
+
+	panel->panel_initialized = true;
+err:
+
 	mutex_unlock(&panel->panel_lock);
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 3f7593e0489c..ccc90c5bd32b 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -233,6 +233,9 @@ struct dsi_panel {
 	bool esd_utag_enable;
 	u64 panel_ver;
 	char panel_name[DSI_PANEL_MAX_PANEL_LEN];
+
+	u32 disp_on_chk_val;
+	bool no_panel_on_read_support;
 };
 
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)

From 2d60cf1313a37a33a99d322b19340297ef979944 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 08:11:13 -0500
Subject: [PATCH 14/94] disp: msm: dsi: Trigger ESD event if display isn't on

Check display turns on  during the display resume. If it doesn't, then
trigger the ESD to restart the panel, instead waiting until the ESD
thread starts, detects, and perform ESD recovery.

Port from: f1cfef0

Change-Id: Ib7c0f2451b5e5cf1630b6335ac1d7ce1ff332d22
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444395
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509797
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index e2868f083dfe..018e8323daab 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -16,6 +16,7 @@
 #include "dsi_ctrl_hw.h"
 #include "dsi_parser.h"
 #include "sde_dbg.h"
+#include "dsi_display.h"
 
 /**
  * topology is currently defined by a set of following 3 values:
@@ -3498,6 +3499,22 @@ end:
 
 }
 
+static int dsi_panel_trigger_panel_dead_event(struct dsi_panel *panel)
+{
+	bool panel_dead;
+	struct drm_event event;
+	struct dsi_display *dsi_display = container_of(panel->host, struct dsi_display, host);
+	struct drm_connector *drm_conn = dsi_display->drm_conn;
+
+	panel_dead = true;
+	event.type = DRM_EVENT_PANEL_DEAD;
+	event.length = sizeof(u32);
+	msm_mode_object_event_notify(&drm_conn->base,
+			drm_conn->dev, &event, (u8 *)&panel_dead);
+
+	return 0;
+}
+
 struct dsi_panel *dsi_panel_get(struct device *parent,
 				struct device_node *of_node,
 				struct device_node *parser_node,
@@ -4630,6 +4647,7 @@ int dsi_panel_enable(struct dsi_panel *panel)
 		if (pwr_mode != panel->disp_on_chk_val) {
 			DSI_ERR("%s: Read Pwr_mode=0%x is not matched with expected value =0x%x\n",
 				__func__, pwr_mode, panel->disp_on_chk_val);
+			dsi_panel_trigger_panel_dead_event(panel);
 		} else
 			DSI_INFO("-. Pwr_mode(0x0A) = 0x%x\n", pwr_mode);
 	} else

From 197a688b6799e2a050eb14327fa15742236af3d7 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 08:25:45 -0500
Subject: [PATCH 15/94] disp: msm: dsi: Raise BUG for continous panel recovery
 failure

After the ESD detection and recovery keep trying to recover panel, but
after 5 times, unsuccessfully recovery the panel, then cal BUG to reboot
the phone.

Port from: 9a4d104

Change-Id: Ibd1aa3e4d83638c029c163fe1de88d7ef4ba5fe2
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444396
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509798
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 018e8323daab..30f7fb4b66a0 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -4620,6 +4620,7 @@ int dsi_panel_enable(struct dsi_panel *panel)
 {
 	int rc = 0;
 	u8 pwr_mode;
+	static int panel_recovery_retry;
 
 	if (!panel) {
 		DSI_ERR("Invalid params\n");
@@ -4647,9 +4648,19 @@ int dsi_panel_enable(struct dsi_panel *panel)
 		if (pwr_mode != panel->disp_on_chk_val) {
 			DSI_ERR("%s: Read Pwr_mode=0%x is not matched with expected value =0x%x\n",
 				__func__, pwr_mode, panel->disp_on_chk_val);
+
+			if (panel_recovery_retry++ > 5) {
+				DSI_ERR("%s: panel recovery failed for all retries",
+					__func__);
+
+				BUG();
+			}
+
 			dsi_panel_trigger_panel_dead_event(panel);
-		} else
+		} else {
 			DSI_INFO("-. Pwr_mode(0x0A) = 0x%x\n", pwr_mode);
+			panel_recovery_retry = 0;
+		}
 	} else
 		DSI_INFO("-: no_panel_on_read_support is set\n");
 

From 2e4c31c1e8a3f1d3416ee3386563b8443b97cd4b Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 08:32:50 -0500
Subject: [PATCH 16/94] disp: msm: sde: Add motUtil Debugfs framework

Adding the motUtil debugfs in /d/dri/0/debug to provide a tool for
developer/tester to interface with the Display driver framework

Port from: 11cb128

Change-Id: I5a385f9f789b56f7a36bde865234325039ec5e36
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444397
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509799
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/Makefile          |   1 +
 msm/sde/sde_kms.c     |   1 +
 msm/sde/sde_motUtil.c | 271 ++++++++++++++++++++++++++++++++++++++++++
 msm/sde/sde_motUtil.h |  38 ++++++
 4 files changed, 311 insertions(+)
 create mode 100644 msm/sde/sde_motUtil.c
 create mode 100644 msm/sde/sde_motUtil.h

diff --git a/msm/Makefile b/msm/Makefile
index 18eb12c35530..b5ab9c01275d 100644
--- a/msm/Makefile
+++ b/msm/Makefile
@@ -32,6 +32,7 @@ msm_drm-$(CONFIG_DRM_MSM_SDE) += sde/sde_crtc.o \
 	sde/sde_core_perf.o \
 	sde/sde_rm.o \
 	sde/sde_kms_utils.o \
+	sde/sde_motUtil.o \
 	sde/sde_kms.o \
 	sde/sde_plane.o \
 	sde/sde_connector.o \
diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c
index 2b8e9e6ff190..748cd5400eee 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -147,6 +147,7 @@ static int _sde_debugfs_init(struct sde_kms *sde_kms)
 
 	(void) sde_debugfs_vbif_init(sde_kms, debugfs_root);
 	(void) sde_debugfs_core_irq_init(sde_kms, debugfs_root);
+	(void) sde_debugfs_mot_util_init(sde_kms, debugfs_root);
 
 	rc = sde_core_perf_debugfs_init(&sde_kms->perf, debugfs_root);
 	if (rc) {
diff --git a/msm/sde/sde_motUtil.c b/msm/sde/sde_motUtil.c
new file mode 100644
index 000000000000..00ae8461658a
--- /dev/null
+++ b/msm/sde/sde_motUtil.c
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#define pr_fmt(fmt)     "motUtil:[%s]" fmt, __func__
+
+#include <linux/debugfs.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
+#include "sde_connector.h"
+#include "sde_encoder.h"
+#include "sde_motUtil.h"
+#include "dsi_display.h"
+
+
+#define MAIN_DSI_CONN_NAME "DSI-1"
+#define CLI_DSI_CONN_NAME "DSI-2"
+
+struct motUtil motUtil_data;
+
+static ssize_t _sde_debugfs_motUtil_string2num(const char __user *buf,
+					size_t count, char buffer[])
+{
+	char *input, *input_copy, *token, *input_dup = NULL;
+	const char *delim =" ";
+	u32 buf_size = 0;
+	int rc=0, strtoint;
+
+	/*copy the data from user space*/
+	input = kmalloc(count + 1, GFP_KERNEL);
+	if (!input)
+		return -ENOMEM;
+
+	if (copy_from_user(input, buf, count)) {
+		SDE_ERROR("copy from user failed\n");
+		rc = -EFAULT;
+		goto end;
+	}
+	input[count]='\0';
+	SDE_INFO("input_cmd = %s\n", input);
+
+	input_copy = kstrdup(input, GFP_KERNEL);
+	if (!input_copy) {
+		rc = -ENOMEM;
+		goto end;
+	}
+
+	input_dup = input_copy,
+	token = strsep(&input_copy, delim);
+	while (token) {
+		rc = kstrtoint(token, 0, &strtoint);
+		if (rc) {
+			SDE_ERROR("input buffer conversion failed\n");
+			goto end;
+		}
+
+		if (buf_size >= MAX_CMD_PAYLOAD_SIZE) {
+			SDE_ERROR("buffer size exceeding the limit %d\n",
+					MAX_CMD_PAYLOAD_SIZE);
+			goto end;
+		}
+
+		buffer[buf_size++] = (strtoint & 0xff);
+		token = strsep(&input_copy, delim);
+	}
+
+	SDE_DEBUG("command packet size in bytes: %u\n", buf_size);
+	rc = buf_size;
+end:
+	kfree(input_dup);
+	kfree(input);
+
+	return rc;
+}
+
+static struct sde_connector *_sde_debugfs_motUtil_get_sde_conn(
+					struct sde_kms *kms,
+					size_t count, char input[])
+{
+	struct drm_device *dev = kms->dev;
+	struct drm_connector *conn = NULL;
+	struct sde_connector *sde_conn = NULL;
+	int found_conn = 0;
+	enum sde_motUtil_disp_cmd panel_type = input[DISPUTIL_PANEL_TYPE];
+
+	mutex_lock(&dev->mode_config.mutex);
+	drm_connector_list_iter_begin(dev, &conn_iter);
+	drm_for_each_connector_iter(conn, &conn_iter) {
+		if (panel_type == MOTUTIL_MAIN_DISP) {
+			if (!strncmp(conn->name, MAIN_DSI_CONN_NAME, 5)) {
+				SDE_DEBUG("found MAIN disp conn\n");
+				found_conn = 1;
+				break;
+			}
+		} else if (panel_type == MOTUTIL_CLI_DISP) {
+			if (!strncmp(conn->name, CLI_DSI_CONN_NAME, 5)) {
+				SDE_DEBUG("found CLI disp conn\n");
+				found_conn = 1;
+				break;
+			}
+		}
+	}
+
+	if (found_conn) {
+		SDE_DEBUG("found SDE Connector for %s\n",
+			(panel_type == MOTUTIL_MAIN_DISP) ?
+				"Main Display" : "CLI Display");
+				sde_conn = to_sde_connector(conn);
+	} else {
+		SDE_ERROR("Can not find SDE Connector for %s\n",
+				(panel_type == MOTUTIL_MAIN_DISP) ?
+				"Main Display" : "CLI Display");
+	}
+
+	drm_connector_list_iter_end(&conn_iter);
+	mutex_unlock(&dev->mode_config.mutex);
+
+	return sde_conn;
+}
+
+static int _sde_debugfs_motUtil_transfer(struct sde_kms *kms,
+					size_t count, char input[])
+{
+	struct sde_connector *sde_conn = NULL;
+	int ret = 0;
+	enum sde_motUtil_disp_cmd panel_type = input[DISPUTIL_PANEL_TYPE];
+
+	if (panel_type > MOTUTIL_CLI_DISP) {
+		SDE_ERROR("Invalid panel number = %d\n", panel_type);
+		return -EINVAL;
+	}
+
+	sde_conn = _sde_debugfs_motUtil_get_sde_conn(kms, count, input);
+	if (!sde_conn) {
+		ret = -EINVAL;
+		goto end;
+	}
+
+	if (sde_conn && !sde_conn->ops.motUtil_transfer) {
+		SDE_ERROR("no motUtil_transfer support for connector name %s\n",
+						sde_conn->name);
+		ret = -ENOENT;
+		goto end;
+	}
+
+	if (motUtil_data.rd_buf) {
+		mutex_lock(&sde_conn->lock);
+		ret = sde_conn->ops.motUtil_transfer(sde_conn->display,
+						input,	count, &motUtil_data);
+		motUtil_data.last_cmd_tx_status = !ret ? true : false;
+		motUtil_data.read_len = ret;
+		mutex_unlock(&sde_conn->lock);
+
+		ret = count;
+	} else
+		ret = -ENOMEM;
+end:
+	return ret;
+}
+
+
+static ssize_t _sde_debugfs_motUtil_exe_command(struct sde_kms *kms,
+					size_t count, char input[])
+{
+	int ret = 0;
+	enum sde_motUtil_type motUtil_type = input[0];
+
+	motUtil_data.motUtil_type = motUtil_type;
+
+	return ret;
+}
+
+static int _sde_debugfs_motUtil_open(struct inode *inode,
+				struct file *file)
+{
+	if (!inode || !file)
+		return -EINVAL;
+
+	/* non-seekable */
+	file->private_data = inode->i_private;
+	return nonseekable_open(inode, file);
+}
+
+static ssize_t _sde_debugfs_motUtil_write(struct file *file,
+			const char __user *buf, size_t count, loff_t *ppos)
+{
+	u32 buf_size = 0;
+	char buffer[MAX_CMD_PAYLOAD_SIZE];
+	struct sde_kms *kms = (struct sde_kms *)file->private_data;
+
+	if (*ppos || !kms) {
+		SDE_ERROR("invalid argument(s)\n");
+		return 0;
+	}
+
+	buf_size = _sde_debugfs_motUtil_string2num(buf, count, buffer);
+	if (!buf_size){
+		SDE_ERROR("invalid input\n");
+		return count;
+	}
+
+	mutex_lock(&motUtil_data.lock);
+	_sde_debugfs_motUtil_exe_command(kms, count, buffer);
+	mutex_unlock(&motUtil_data.lock);
+
+	return count;
+}
+
+static ssize_t _sde_debugfs_motUtil_read(struct file *file,
+			char __user *buf, size_t count, loff_t *ppos)
+{
+	int blen = 0;
+	char buffer[MAX_CMD_PAYLOAD_SIZE];
+
+	if (*ppos)
+		return 0;
+
+	mutex_lock(&motUtil_data.lock);
+	if (!motUtil_data.read_cmd)
+		blen = snprintf(buffer, MAX_CMD_PAYLOAD_SIZE,
+			"motUtil_status: 0x%x\n",
+			motUtil_data.last_cmd_tx_status);
+
+        SDE_INFO("%s\n", buffer);
+
+        if (blen <= 0) {
+                SDE_ERROR("snprintf failed, blen %d\n", blen);
+                return 0;
+        }
+
+        if (copy_to_user(buf, buffer, min(count, (size_t)blen+1))) {
+                SDE_ERROR("copy to user buffer failed\n");
+                return -EFAULT;
+        }
+
+        *ppos += blen;
+	mutex_unlock(&motUtil_data.lock);
+        return blen;
+}
+
+static const struct file_operations sde_debugfs_motUtil_fops = {
+	.open =         _sde_debugfs_motUtil_open,
+	.read =         _sde_debugfs_motUtil_read,
+	.write =        _sde_debugfs_motUtil_write,
+};
+
+int sde_debugfs_mot_util_init(struct sde_kms *sde_kms,
+			struct dentry *parent)
+{
+	debugfs_create_file("motUtil", 0606, parent,
+			sde_kms, &sde_debugfs_motUtil_fops);
+
+	motUtil_data.rd_buf = kzalloc(SZ_4K, GFP_KERNEL);
+	if (!motUtil_data.rd_buf)
+		return -ENOMEM;
+
+	motUtil_data.te_enable = true;
+	mutex_init(&motUtil_data.lock);
+	return 0;
+}
diff --git a/msm/sde/sde_motUtil.h b/msm/sde/sde_motUtil.h
new file mode 100644
index 000000000000..0c51d8e486ca
--- /dev/null
+++ b/msm/sde/sde_motUtil.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __MOTUTIL_H__
+#define __MOTUTIL_H__
+
+#include <linux/debugfs.h>
+#include <linux/types.h>
+
+enum sde_motUtil_type {
+};
+
+struct motUtil {
+	struct mutex lock;
+	enum sde_motUtil_type motUtil_type;
+	bool read_cmd;
+	bool last_cmd_tx_status;
+	u16 read_len;
+	u8 *rd_buf;
+	int val;
+	bool te_enable;
+};
+
+int sde_debugfs_mot_util_init(struct sde_kms *sde_kms,
+			struct dentry *parent);
+
+#endif /* __MOTUTIL_H__ */

From 912a0498c8b32c199cd24127e1a0c9f2321b9ab1 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 28 Aug 2019 14:02:15 -0500
Subject: [PATCH 17/94] disp: msm: Add DispUtil tool to motUtil Debugfs

Add the Display Utility(DispUtil) support to the motUtil Debugfs Framework.
This dispUtil tool will send a command from the motUtil debugfs to the panel
or it can read any information from panel back.
The 1st byte (set to 0) will indicate for the displUtil tool.

DispUtil Format:

1st         2nd         3rd    4th  5th       6th
0=DispUtil  0=Pri Disp 0=write 0=HS 0=DCS     number byte to read
            1=Sec Disp 1=read  1=LP 1=Generic

7th        8th         9th....
payldLen_u payldLen_l  payload

Port from: 79ee37d

Change-Id: Ib95d46342915543f942926df167e915cdd733252
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444398
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509800
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c   | 207 ++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_display.h   |  14 +++
 msm/sde/sde_connector.h |  13 +++
 msm/sde/sde_kms.c       |   5 +
 msm/sde/sde_motUtil.c   |  31 +++++-
 msm/sde/sde_motUtil.h   |  25 +++++
 6 files changed, 294 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 633dd3c5473b..03e075f5a639 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -928,6 +928,166 @@ static int dsi_display_cmd_prepare(const char *cmd_buf, u32 cmd_buf_len,
 	return 0;
 }
 
+
+static int dsi_display_dispUtil_get_datatype (char dsi_cmd, u8 cmd_type,
+				size_t tx_len, u8 *tx_data_type)
+{
+	int rc = 0;
+
+	*tx_data_type = 0;
+
+	/* cmd_type = 0 : DSI DCS cmd;
+	 * cmd_type = 1 : DSI Generic cmd */
+	if (cmd_type > DISPUTIL_DSI_GENERIC) {
+		DSI_ERR("%s: Invalid DSI package type[%d] = 0x%x\n",
+					__func__, DISPUTIL_MIPI_CMD_TYPE,
+					cmd_type);
+		return -EINVAL;
+	}
+
+	DSI_DEBUG("dsi_cmd =0x%x cmd_type=0x%x tx_len=0x%x\n",
+				dsi_cmd, cmd_type, (u32)tx_len);
+
+	if (dsi_cmd == DISPUTIL_DSI_WRITE) {
+		/* This is a DSI write command */
+		switch(tx_len) {
+		case 1:
+			if (cmd_type == DISPUTIL_DSI_GENERIC)
+				/* write, generic, no param */
+				*tx_data_type = 0x3;
+			else if (cmd_type == DISPUTIL_DSI_DCS)
+				/* write, DCS, no param */
+				*tx_data_type = 0x5;
+			break;
+		case 2:
+			if (cmd_type == DISPUTIL_DSI_GENERIC)
+				/* Write, generic, 1 param */
+				*tx_data_type = 0x13;
+			else if (cmd_type == DISPUTIL_DSI_DCS)
+				/* write, DCS, 1 param */
+				*tx_data_type = 0x15;
+			break;
+		default:
+			if (cmd_type == DISPUTIL_DSI_GENERIC)
+				/* Write, generic, long*/
+				*tx_data_type = 0x29;
+			else if (cmd_type == DISPUTIL_DSI_DCS)
+				/* write, DCS, long*/
+				*tx_data_type = 0x39;
+			break;
+		}
+	} else if (dsi_cmd == DISPUTIL_DSI_READ) {
+		if ((cmd_type == DISPUTIL_DSI_DCS) && (tx_len > 1)) {
+			/* Note: tx_len will include read command and payload */
+			/* DCS read */
+			DSI_ERR("DCS read supports no parameter. tx_len=%d\n",
+					(u32)tx_len);
+			rc = -EINVAL;
+		} else {
+			switch(tx_len) {
+			case 1:
+				if (cmd_type == DISPUTIL_DSI_GENERIC)
+					/* Read, generic, no param */
+					*tx_data_type = 0x4;
+				else if (cmd_type == DISPUTIL_DSI_DCS)
+					/* Read, DCS, no param */
+					*tx_data_type = 0x6;
+				break;
+			case 2:
+				if (cmd_type == DISPUTIL_DSI_GENERIC)
+					/* Read, Generic, 1 param */
+					*tx_data_type = 0x14;
+
+				break;
+			case 3:
+				if (cmd_type == DISPUTIL_DSI_GENERIC)
+					/* read, generic, 2 params */
+					*tx_data_type = 0x24;
+				break;
+			default:
+				DSI_ERR("Invalid for tx_len= %d\n", (u32)tx_len);
+				break;
+			}
+		}
+	} else
+		rc = -EINVAL;
+
+	if (rc)
+		DSI_ERR("Invalid input data: dsi_cmd=0x%x tx_data_type =0x%x for tx_len=0x%x\n",
+			dsi_cmd, *tx_data_type, (u32)tx_len);
+
+	return rc;
+}
+
+static int dsi_display_dispUtil_prepare(const char *cmd_buf, u32 cmd_buf_len,
+	struct dsi_cmd_desc *cmd, u8 *payload, u32 payload_len_max,
+	struct motUtil *motUtil_data)
+{
+	int rc, i;
+	u8 tx_data_type;
+
+	memset(cmd, 0x00, sizeof(*cmd));
+
+	/*
+	 * DISPUTIL_PAYLOAD_LEN_U and SDE_MOT_UTIL_PAYLOAD_LEN_L to
+	 * indicate number of payload in bytes
+	 */
+	cmd->msg.tx_len = ((cmd_buf[DISPUTIL_PAYLOAD_LEN_U] << 8) |
+				(cmd_buf[DISPUTIL_PAYLOAD_LEN_L]));
+	rc = dsi_display_dispUtil_get_datatype(cmd_buf[DISPUTIL_CMD_TYPE],
+				cmd_buf[DISPUTIL_MIPI_CMD_TYPE],
+				cmd->msg.tx_len, &tx_data_type);
+	if (rc)
+		return rc;
+
+	cmd->msg.type = tx_data_type;
+	cmd->msg.channel =  0;
+	cmd->last_command = 1;
+	cmd->msg.flags |= MIPI_DSI_MSG_LASTCOMMAND;
+
+	/* DISPUTIL_CMD_TYPE = 1 for DSI write cmd
+	 * DISPUTIL_CMD_TYPE = 0 for DSI read cmd */
+	if (cmd_buf[DISPUTIL_CMD_TYPE] == DISPUTIL_DSI_READ) {
+		cmd->msg.flags |= MIPI_DSI_MSG_READ; /* This is a read DSI */
+		cmd->msg.rx_buf = motUtil_data->rd_buf;
+		/* cmd_buf[3] = number bytes host wants to read */
+		cmd->msg.rx_len = cmd_buf[DISPUTIL_NUM_BYTE_RD];
+
+		motUtil_data->read_cmd = true;
+	} else
+		motUtil_data->read_cmd = false;
+
+	/*
+	 * DISPUTIL_CMD_XFER_MODE = 0: DSI cmd transfers at HS mode
+	 * DISPUTIL_CMD_XFER_MODE = 1: DSI cmd transfers at LP mode
+	 */
+	if (cmd_buf[DISPUTIL_CMD_XFER_MODE] == DISPUTIL_DSI_LP_MODE)
+		cmd->msg.flags |= MIPI_DSI_MSG_USE_LPM;
+
+	cmd->msg.ctrl = 0;
+	cmd->post_wait_ms = 0;
+
+	/*
+	 * msg.tx_len is number of bytes of the payload.
+	 * Checking msg.tx_len with the payload, DISPUTIL_PAYLOAD,
+	 * to make sure they are matched
+	 */
+	if ((cmd->msg.tx_len > (cmd_buf_len - DISPUTIL_PAYLOAD)) ||
+			(cmd->msg.tx_len > payload_len_max)) {
+		DSI_ERR("Incorrect payload length tx_len:%ld, payload_len_max=%d cmd_buf_len=%d\n",
+			cmd->msg.tx_len, payload_len_max, cmd_buf_len);
+		return -EINVAL;
+	}
+
+	for (i = 0; i < cmd->msg.tx_len; i++)
+		payload[i] = cmd_buf[DISPUTIL_PAYLOAD + i];
+
+	cmd->msg.tx_buf = payload;
+
+	return 0;
+}
+
+
 static int dsi_display_ctrl_get_host_init_state(struct dsi_display *dsi_display,
 		bool *state)
 {
@@ -1021,6 +1181,51 @@ static void _dsi_display_continuous_clk_ctrl(struct dsi_display *display,
 	}
 }
 
+int dsi_display_motUtil_transfer(void *display, const char *cmd_buf,
+                u32 cmd_buf_len, struct motUtil *motUtil_data)
+{
+	struct dsi_display *dsi_display = display;
+	struct dsi_cmd_desc cmd;
+	u8 cmd_payload[MAX_CMD_PAYLOAD_SIZE];
+	int rc = 0;
+	bool state = false;
+
+	if (!dsi_display || !cmd_buf) {
+		DSI_ERR("[DSI] invalid params\n");
+		return -EINVAL;
+	}
+
+	DSI_INFO("[DSI] Display dispUtil transfer\n");
+
+	rc = dsi_display_dispUtil_prepare(cmd_buf, cmd_buf_len,
+				&cmd, cmd_payload, MAX_CMD_PAYLOAD_SIZE,
+				motUtil_data);
+	if (rc) {
+		DSI_ERR("[DSI] command prepare failed. rc %d\n", rc);
+		return rc;
+	}
+
+	mutex_lock(&dsi_display->display_lock);
+	rc = dsi_display_ctrl_get_host_init_state(dsi_display, &state);
+	if (rc || !state) {
+		DSI_ERR("[DSI] Invalid host state %d rc %d\n",
+						state, rc);
+		rc = -EPERM;
+		goto end;
+	}
+
+	/*
+	 * rc will be returned from ops->transfer, which will be 0 or 1 for
+	 * DSI write command. rc will be returned for number of read bytes
+	 * for DSI read commad
+	 */
+	rc = dsi_display->host.ops->transfer(&dsi_display->host,
+						&cmd.msg);
+end:
+	mutex_unlock(&dsi_display->display_lock);
+	return rc;
+}
+
 int dsi_display_soft_reset(void *display)
 {
 	struct dsi_display *dsi_display;
@@ -2974,6 +3179,8 @@ static ssize_t dsi_host_transfer(struct mipi_dsi_host *host,
 				msg->flags & MIPI_DSI_MSG_ASYNC_OVERRIDE)
 			cmd_flags |= DSI_CTRL_CMD_ASYNC_WAIT;
 
+		if (msg->rx_buf)
+			flags |= DSI_CTRL_CMD_READ;
 		rc = dsi_ctrl_cmd_transfer(display->ctrl[ctrl_idx].ctrl, msg,
 				&cmd_flags);
 		if (rc) {
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index 873c305497cf..a97c77f59d24 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -19,6 +19,8 @@
 #include "dsi_ctrl.h"
 #include "dsi_phy.h"
 #include "dsi_panel.h"
+#include "sde_connector.h"
+#include "sde_motUtil.h"
 
 #define MAX_DSI_CTRLS_PER_DISPLAY             2
 #define DSI_CLIENT_NAME_SIZE		20
@@ -656,6 +658,18 @@ int dsi_display_cmd_transfer(struct drm_connector *connector,
 		void *display, const char *cmd_buffer,
 		u32 cmd_buf_len);
 
+/**
+ * dsi_display_motUtil_transfer() - Convert motUtil data and transfer command
+ *						to the panel
+ * @display:            Handle to display.
+ * @cmd_buf:            Command buffer
+ * @cmd_buf_len:        Command buffer length in bytes
+ * @motUtil_data:	motUtil data information
+ */
+int dsi_display_motUtil_transfer(void *display, const char *cmd_buf,
+		u32 cmd_buf_len, struct motUtil *motUtil_data);
+
+
 /**
  * dsi_display_soft_reset() - perform a soft reset on DSI controller
  * @display:         Handle to display
diff --git a/msm/sde/sde_connector.h b/msm/sde/sde_connector.h
index cbc6bfa0ce7f..44a1fc689492 100644
--- a/msm/sde/sde_connector.h
+++ b/msm/sde/sde_connector.h
@@ -15,6 +15,7 @@
 #include "msm_prop.h"
 #include "sde_kms.h"
 #include "sde_fence.h"
+#include "sde_motUtil.h"
 
 #define SDE_CONNECTOR_NAME_SIZE	16
 #define SDE_CONNECTOR_DHDR_MEMPOOL_MAX_SIZE	SZ_32
@@ -264,6 +265,18 @@ struct sde_connector_ops {
 			void *display, const char *cmd_buf,
 			u32 cmd_buf_len);
 
+	/**
+	 * motUtil_transfer - Convert motUtil data and Transfer command
+	 * 			to the connected display panel
+	 * @display: Pointer to private display handle
+	 * @cmd_buf: Command buffer
+	 * @cmd_buf_len: Command buffer length in bytes
+	 * @motUtil_data: motUtil data information
+	 * Returns: Zero for success, negetive for failure
+	 */
+	int (*motUtil_transfer)(void *display, const char *cmd_buf,
+			u32 cmd_buf_len, struct motUtil *motUtil_data);
+
 	/**
 	 * 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 748cd5400eee..9701fdb4a098 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -27,6 +27,8 @@
 #include <linux/of_irq.h>
 #include <linux/dma-buf.h>
 #include <linux/memblock.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/bootmem.h>
 #include <soc/qcom/scm.h>
 
@@ -55,6 +57,8 @@
 #include "soc/qcom/secure_buffer.h"
 #include "soc/qcom/qtee_shmbridge.h"
 
+#include "sde_motUtil.h"
+
 #define CREATE_TRACE_POINTS
 #include "sde_trace.h"
 
@@ -1431,6 +1435,7 @@ static int _sde_kms_setup_displays(struct drm_device *dev,
 		.post_kickoff = dsi_conn_post_kickoff,
 		.check_status = dsi_display_check_status,
 		.enable_event = dsi_conn_enable_event,
+		.motUtil_transfer = dsi_display_motUtil_transfer,
 		.cmd_transfer = dsi_display_cmd_transfer,
 		.cont_splash_config = dsi_display_cont_splash_config,
 		.get_panel_vfp = dsi_display_get_panel_vfp,
diff --git a/msm/sde/sde_motUtil.c b/msm/sde/sde_motUtil.c
index 00ae8461658a..ef41494c76da 100644
--- a/msm/sde/sde_motUtil.c
+++ b/msm/sde/sde_motUtil.c
@@ -93,6 +93,7 @@ static struct sde_connector *_sde_debugfs_motUtil_get_sde_conn(
 	struct sde_connector *sde_conn = NULL;
 	int found_conn = 0;
 	enum sde_motUtil_disp_cmd panel_type = input[DISPUTIL_PANEL_TYPE];
+	struct drm_connector_list_iter conn_iter;
 
 	mutex_lock(&dev->mode_config.mutex);
 	drm_connector_list_iter_begin(dev, &conn_iter);
@@ -177,6 +178,14 @@ static ssize_t _sde_debugfs_motUtil_exe_command(struct sde_kms *kms,
 	enum sde_motUtil_type motUtil_type = input[0];
 
 	motUtil_data.motUtil_type = motUtil_type;
+	switch (motUtil_type) {
+	case MOTUTIL_DISP_UTIL:
+		ret = _sde_debugfs_motUtil_transfer(kms, count, input);
+		break;
+	default:
+		SDE_ERROR("Un-support motUtil type = %d\n", motUtil_type);
+		ret = -EINVAL;
+	}
 
 	return ret;
 }
@@ -217,6 +226,23 @@ static ssize_t _sde_debugfs_motUtil_write(struct file *file,
 	return count;
 }
 
+static ssize_t _sde_debugfs_motUtil_dispUtil_read(char *buffer)
+{
+	int blen = 0, i;
+
+	if (motUtil_data.read_len) {
+		blen = snprintf(buffer, 16, "motUtil_read: ");
+		for (i = 0; i < motUtil_data.read_len; i ++)
+			blen += snprintf((buffer + blen) , 6, "0x%02x ",
+					*motUtil_data.rd_buf++);
+
+			blen += snprintf((buffer + blen), 2, "\n");
+	} else
+		SDE_ERROR("motUtil failed to read from panel\n");
+
+	return blen;
+}
+
 static ssize_t _sde_debugfs_motUtil_read(struct file *file,
 			char __user *buf, size_t count, loff_t *ppos)
 {
@@ -227,10 +253,13 @@ static ssize_t _sde_debugfs_motUtil_read(struct file *file,
 		return 0;
 
 	mutex_lock(&motUtil_data.lock);
-	if (!motUtil_data.read_cmd)
+	if (!motUtil_data.read_cmd) {
 		blen = snprintf(buffer, MAX_CMD_PAYLOAD_SIZE,
 			"motUtil_status: 0x%x\n",
 			motUtil_data.last_cmd_tx_status);
+	} else if (motUtil_data.motUtil_type == MOTUTIL_DISP_UTIL) {
+			blen = _sde_debugfs_motUtil_dispUtil_read(buffer);
+	}
 
         SDE_INFO("%s\n", buffer);
 
diff --git a/msm/sde/sde_motUtil.h b/msm/sde/sde_motUtil.h
index 0c51d8e486ca..bc83b35e5d77 100644
--- a/msm/sde/sde_motUtil.h
+++ b/msm/sde/sde_motUtil.h
@@ -19,6 +19,19 @@
 #include <linux/types.h>
 
 enum sde_motUtil_type {
+        MOTUTIL_DISP_UTIL = 0,
+};
+
+enum sde_motUtil_disp_cmd {
+	DISPUTIL_TYPE = 0,
+	DISPUTIL_PANEL_TYPE,
+	DISPUTIL_CMD_TYPE,
+	DISPUTIL_CMD_XFER_MODE,
+	DISPUTIL_MIPI_CMD_TYPE,
+	DISPUTIL_NUM_BYTE_RD,
+	DISPUTIL_PAYLOAD_LEN_U,
+	DISPUTIL_PAYLOAD_LEN_L,
+	DISPUTIL_PAYLOAD,
 };
 
 struct motUtil {
@@ -32,6 +45,18 @@ struct motUtil {
 	bool te_enable;
 };
 
+#define DISPUTIL_DSI_WRITE      0
+#define DISPUTIL_DSI_READ       1
+
+#define DISPUTIL_DSI_DCS        0
+#define DISPUTIL_DSI_GENERIC    1
+
+#define DISPUTIL_DSI_HS_MODE    0
+#define DISPUTIL_DSI_LP_MODE    1
+
+#define MOTUTIL_MAIN_DISP	0
+#define MOTUTIL_CLI_DISP	1
+
 int sde_debugfs_mot_util_init(struct sde_kms *sde_kms,
 			struct dentry *parent);
 

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 18/94] 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,

From fa247f6d83657fb0380a56f74c044fae0994b4d7 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 12:58:34 -0500
Subject: [PATCH 19/94] disp: msm: add panel's param feature to display FW

Add the display's param feature such as HBM, ACL, or CABC feature to
display framework

Port from: f988eb8

Change-Id: I445ea7e58188d2354888e2202ed7119bf2e55fc9
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444400
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509802
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_defs.h      |   4 +
 msm/dsi/dsi_display.c   |  22 +++++
 msm/dsi/dsi_display.h   |   2 +
 msm/dsi/dsi_panel.c     | 175 ++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h     |  30 ++++++-
 msm/msm_drv.h           |  13 +++
 msm/sde/sde_connector.c |  73 +++++++++++++++++
 msm/sde/sde_connector.h |   7 ++
 msm/sde/sde_kms.c       |   3 +
 9 files changed, 328 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 5179edfebd02..979a60254dbf 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -281,6 +281,8 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_POST_TIMING_SWITCH:        Post timing switch
  * @DSI_CMD_SET_QSYNC_ON                   Enable qsync mode
  * @DSI_CMD_SET_QSYNC_OFF                  Disable qsync mode
+ * @DSI_CMD_SET_HBM_ON:                    Turning HBM on
+ * @DSI_CMD_SET_HBM_OFF:                   Turning HBM off
  * @DSI_CMD_SET_MAX
  */
 enum dsi_cmd_set_type {
@@ -307,6 +309,8 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_POST_TIMING_SWITCH,
 	DSI_CMD_SET_QSYNC_ON,
 	DSI_CMD_SET_QSYNC_OFF,
+	DSI_CMD_SET_HBM_ON,
+	DSI_CMD_SET_HBM_OFF,
 	DSI_CMD_SET_MAX
 };
 
diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 03f7ca1ab4a1..c13dab6a23ab 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -246,6 +246,28 @@ error:
 	return rc;
 }
 
+int dsi_display_set_param(void *display, struct msm_param_info *param_info)
+{
+	struct dsi_display *dsi_display = display;
+	struct dsi_panel *panel;
+	int rc = 0;
+
+	if (dsi_display == NULL || dsi_display->panel == NULL)
+		return -EINVAL;
+
+	panel = dsi_display->panel;
+
+	DSI_DEBUG("%s+\n", __func__);
+	if (!dsi_panel_initialized(panel))
+		return -EINVAL;
+
+	rc = dsi_panel_set_param(panel, param_info);
+	if (rc)
+		DSI_ERR("[%s] failed to panel to set param. rc=%d\n",
+				dsi_display->name, rc);
+	return rc;
+}
+
 static int dsi_display_cmd_engine_enable(struct dsi_display *display)
 {
 	int rc = 0;
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index ea65e6b68a77..9537ab435f10 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -563,6 +563,8 @@ int dsi_post_clkoff_cb(void *priv, enum dsi_clk_type clk_type,
 		enum dsi_lclk_type l_type,
 		enum dsi_clk_state curr_state);
 
+int dsi_display_set_param(void *display, struct msm_param_info *param_info);
+
 /**
  * dsi_post_clkon_cb() - Callback after clock is turned on
  * @priv: private data pointer.
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 30f7fb4b66a0..52cbef5f41af 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -101,6 +101,15 @@ static char dsi_dsc_rc_range_max_qp_1_1_scr1[][15] = {
 static char dsi_dsc_rc_range_bpg_offset[] = {2, 0, 0, -2, -4, -6, -8, -8,
 		-8, -10, -10, -12, -12, -12, -12};
 
+static struct panel_param_val_map hbm_map[HBM_STATE_NUM] = {
+	{HBM_OFF_STATE, DSI_CMD_SET_HBM_OFF, NULL},
+	{HBM_ON_STATE, DSI_CMD_SET_HBM_ON, NULL},
+};
+
+static struct panel_param dsi_panel_param[PARAM_ID_NUM] = {
+	{"HBM", hbm_map, HBM_STATE_NUM, HBM_OFF_STATE, HBM_OFF_STATE, false},
+};
+
 int dsi_dsc_create_pps_buf_cmd(struct msm_display_dsc_info *dsc, char *buf,
 				int pps_id)
 {
@@ -830,6 +839,100 @@ static int dsi_panel_pwm_register(struct dsi_panel *panel)
 	return 0;
 }
 
+static int dsi_panel_send_param_cmd (struct dsi_panel *panel,
+                                struct msm_param_info *param_info)
+{
+	int rc = 0;
+	struct panel_param_val_map *param_map;
+	struct panel_param_val_map *param_map_state;
+	struct panel_param *panel_param;
+	struct dsi_cmd_desc *cmds;
+	ssize_t len;
+	const struct mipi_dsi_host_ops *ops = panel->host->ops;
+
+	panel_param = &panel->param_cmds[param_info->param_idx];
+	if (!panel_param) {
+		DSI_ERR("%s: invalid panel_param.\n", __func__);
+		return -EINVAL;
+	}
+
+        param_map = panel_param->val_map;
+
+	DSI_DEBUG("%s: param_name=%s; val_max =%d, default_value=%d, value=%d\n",
+	        __func__, panel_param->param_name, panel_param->val_max,
+		panel_param->default_value, panel_param->value);
+
+	mutex_lock(&panel->panel_lock);
+	if (panel_param->value == param_info->value)
+	{
+		DSI_INFO("%s(mode=%d): requested value=%d is same. Do nothing\n",
+			__func__, param_info->param_idx, param_info->value);
+		rc = 0;
+	} else {
+		DSI_DEBUG("%s: requested: old=%d new=%d.\n", __func__,
+			panel_param->value, param_info->value);
+		param_map = panel->param_cmds[param_info->param_idx].val_map;
+		param_map_state = &param_map[param_info->value];
+
+		cmds = param_map_state->cmds->cmds;
+		if (param_map_state->cmds->state == DSI_CMD_SET_STATE_LP)
+			cmds->msg.flags |= MIPI_DSI_MSG_USE_LPM |
+						MIPI_DSI_MSG_LASTCOMMAND;
+		len = ops->transfer(panel->host, &cmds->msg);
+		if (len < 0) {
+			rc = len;
+			DSI_ERR("%s:failed to send param cmd, rc=%d\n",
+					__func__, rc);
+			goto end;
+		}
+
+		panel_param->value = param_info->value;
+		DSI_INFO("%s(%d) is setting new value %d\n", __func__,
+			param_info->param_idx, param_info->value);
+		rc = len;
+	}
+
+end:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+};
+
+static int dsi_panel_set_hbm(struct dsi_panel *panel,
+                        struct msm_param_info *param_info)
+{
+	int rc = 0;
+
+	pr_info("%s(%d)\n", __func__, param_info->value);
+	rc = dsi_panel_send_param_cmd(panel, param_info);
+	if (rc < 0)
+		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
+
+        return rc;
+};
+
+int dsi_panel_set_param(struct dsi_panel *panel,
+				struct msm_param_info *param_info)
+{
+	int rc = 0;
+
+	if (!panel || !param_info) {
+                DSI_ERR("invalid params\n");
+                return -EINVAL;
+        }
+
+	DSI_DEBUG("%s+\n", __func__);
+
+	if (param_info->param_idx == PARAM_HBM_ID)
+		rc = dsi_panel_set_hbm(panel, param_info);
+	else {
+		DSI_ERR("%s: Invalid set_param type=%d\n",
+			__func__, param_info->param_idx);
+		rc = -EINVAL;
+	}
+
+	return rc;
+}
+
 static int dsi_panel_bl_register(struct dsi_panel *panel)
 {
 	int rc = 0;
@@ -1888,6 +1991,9 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-post-mode-switch-on-command",
 	"qcom,mdss-dsi-qsync-on-commands",
 	"qcom,mdss-dsi-qsync-off-commands",
+	"qcom,mdss-dsi-hbm-on-command",
+	"qcom,mdss-dsi-hbm-off-command",
+
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -1914,6 +2020,8 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-post-mode-switch-on-command-state",
 	"qcom,mdss-dsi-qsync-on-commands-state",
 	"qcom,mdss-dsi-qsync-off-commands-state",
+	"qcom,mdss-dsi-hbm-on-command-state",
+	"qcom,mdss-dsi-hbm-off-command-state",
 };
 
 static int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
@@ -3429,6 +3537,68 @@ end:
 	utils->node = panel->panel_of_node;
 }
 
+static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
+					struct device_node *of_node)
+{
+	int i, j, rc =0;
+	struct panel_param *param;
+	struct panel_param_val_map *param_map;
+	struct dsi_panel_cmd_set *cmds;
+	enum dsi_cmd_set_type type;
+	const char *prop;
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	for (i = 0; i < PARAM_ID_NUM; i++) {
+		param = &dsi_panel_param[i];
+
+		for (j = 0; j < param->val_max; j++) {
+			param_map = &param->val_map[j];
+			param_map->cmds = NULL;
+			cmds = kcalloc(param->val_max,
+				sizeof(struct dsi_panel_cmd_set), GFP_KERNEL);
+			if (cmds == NULL) {
+				rc = -ENOMEM;
+				goto err;
+			}
+
+			param_map->cmds = cmds;
+			type = param_map->type;
+			prop =  cmd_set_prop_map[type];
+			if (!prop)
+				continue;
+
+			rc = dsi_panel_parse_cmd_sets_sub(param_map->cmds,
+							type, utils);
+			if (rc) {
+				DSI_ERR("panel param cmd %s parsing failed\n",
+						param->param_name);
+				rc = -EINVAL;
+				goto parse_err;
+			}
+		}
+
+		param->is_supported = true;
+		DSI_INFO("%s: feature enabled.\n", param->param_name);
+	}
+
+	return rc;
+
+parse_err:
+	for (i = 0; i < ARRAY_SIZE(dsi_panel_param); i++) {
+		param = &dsi_panel_param[i];
+		for (j = 0; j < param->val_max; j++) {
+			if (param->val_map[j].cmds) {
+				kfree(param->val_map[j].cmds);
+				param->val_map[j].cmds= NULL;
+			}
+		}
+		param->is_supported = false;
+	}
+err:
+	return rc;
+
+}
+
 static int dsi_panel_parse_mot_panel_config(struct dsi_panel *panel,
 					struct device_node *of_node)
 {
@@ -3555,6 +3725,11 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 	if (rc)
 		DSI_DEBUG("failed to parse mot_panel_config, rc = %d\n", rc);
 
+	panel->param_cmds = &dsi_panel_param[0];
+	rc = dsi_panel_parse_param_prop(panel, of_node);
+	if (rc)
+		pr_debug("failed to parse panel param prop, rc =%d\n", rc);
+
 	rc = dsi_panel_parse_host_config(panel);
 	if (rc) {
 		DSI_ERR("failed to parse host configuration, rc=%d\n",
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index ccc90c5bd32b..dbdcb1ad94b2 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -28,7 +28,6 @@
 
 #define DSI_MODE_MAX 32
 
-#define DSI_PANEL_MAX_PANEL_LEN 256
 
 /*
  * Defining custom dsi msg flag,
@@ -37,6 +36,9 @@
  */
 #define MIPI_DSI_MSG_ASYNC_OVERRIDE BIT(4)
 
+#define DSI_PANEL_MAX_PANEL_LEN	256
+#define MAX_PARAM_NAME 10
+
 enum dsi_panel_rotation {
 	DSI_PANEL_ROTATE_NONE = 0,
 	DSI_PANEL_ROTATE_HV_FLIP,
@@ -176,6 +178,27 @@ struct drm_panel_esd_config {
 	u32 groups;
 };
 
+enum hbm_state {
+	HBM_OFF_STATE = 0,
+	HBM_ON_STATE,
+	HBM_STATE_NUM
+};
+
+struct panel_param_val_map {
+	int state;
+	enum dsi_cmd_set_type type;
+	struct dsi_panel_cmd_set *cmds;
+};
+
+struct panel_param {
+	const char *param_name;
+	struct panel_param_val_map *val_map;
+	const u16 val_max;
+	const u16 default_value;
+	u16 value;
+	bool is_supported;
+};
+
 struct dsi_panel {
 	const char *name;
 	const char *type;
@@ -236,6 +259,8 @@ struct dsi_panel {
 
 	u32 disp_on_chk_val;
 	bool no_panel_on_read_support;
+
+	struct panel_param *param_cmds;
 };
 
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)
@@ -356,4 +381,7 @@ void dsi_panel_ext_bridge_put(struct dsi_panel *panel);
 void dsi_panel_calc_dsi_transfer_time(struct dsi_host_common_cfg *config,
 		struct dsi_display_mode *mode, u32 frame_threshold_us);
 
+int dsi_panel_set_param(struct dsi_panel *panel,
+			struct msm_param_info *param_info);
+
 #endif /* _DSI_PANEL_H_ */
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 4ba732d86d7c..44210badce15 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -202,6 +202,8 @@ enum msm_mdp_conn_property {
 	CONNECTOR_PROP_QSYNC_MODE,
 	CONNECTOR_PROP_CMD_FRAME_TRIGGER_MODE,
 
+	/* MOT feature panel*/
+	CONNECTOR_PROP_HBM,
 	/* total # of properties */
 	CONNECTOR_PROP_COUNT
 };
@@ -310,6 +312,17 @@ struct msm_roi_caps {
 	struct msm_roi_alignment align;
 };
 
+enum msm_param_id {
+	PARAM_HBM_ID = 0,
+	PARAM_ID_NUM
+};
+
+struct msm_param_info {
+	enum msm_param_id param_idx;
+	enum msm_mdp_conn_property param_conn_idx;
+	int value;
+};
+
 /**
  * struct msm_display_dsc_info - defines dsc configuration
  * @version:                 DSC version.
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index a470f0cc52ca..0f53f9da4ec9 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -692,6 +692,24 @@ static int _sde_connector_update_hdr_metadata(struct sde_connector *c_conn,
 	return rc;
 }
 
+static int _sde_connector_update_param(struct sde_connector *c_conn,
+			struct msm_param_info *param_info)
+{
+	struct dsi_display *dsi_display;
+	int rc = 0;
+
+	if (!c_conn) {
+		SDE_ERROR("Invalid params sde_connector null\n");
+		return -EINVAL;
+	}
+
+	dsi_display = c_conn->display;
+	if (dsi_display && c_conn->ops.set_param)
+		rc = c_conn->ops.set_param(dsi_display, param_info);
+
+	return rc;
+}
+
 static int _sde_connector_update_dirty_properties(
 				struct drm_connector *connector)
 {
@@ -1362,6 +1380,7 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 	int idx, rc;
 	uint64_t fence_user_fd;
 	uint64_t __user prev_user_fd;
+	struct msm_param_info param_info;
 
 	if (!connector || !state || !property) {
 		SDE_ERROR("invalid argument(s), conn %pK, state %pK, prp %pK\n",
@@ -1471,6 +1490,13 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 		msm_property_set_dirty(&c_conn->property_info,
 				&c_state->property_state, idx);
 		break;
+	case CONNECTOR_PROP_HBM:
+		param_info.value = sde_connector_get_property(
+				connector->state, CONNECTOR_PROP_HBM);
+		param_info.param_idx = PARAM_HBM_ID;
+		param_info.param_conn_idx = CONNECTOR_PROP_HBM;
+		_sde_connector_update_param(c_conn, &param_info);
+		break;
 	default:
 		break;
 	}
@@ -2353,6 +2379,45 @@ static int sde_connector_populate_mode_info(struct drm_connector *conn,
 	return rc;
 }
 
+static int sde_connector_install_panel_params(struct sde_connector *c_conn)
+{
+	struct panel_param *param_cmds;
+	uint32_t prop_idx;
+	int i;
+	struct dsi_display *dsi_display;
+
+
+	if (c_conn->connector_type != DRM_MODE_CONNECTOR_DSI)
+		return 0;
+
+	dsi_display = (struct dsi_display *) (c_conn->display);
+	param_cmds = dsi_display->panel->param_cmds;
+	for (i = 0; i < PARAM_ID_NUM; i++) {
+		SDE_DEBUG("%s:i = %d param_name = %s is_support=%d\n",
+			__func__, i,
+                        param_cmds->param_name, param_cmds->is_supported);
+
+		if (!strncmp(param_cmds->param_name, "HBM", 3))
+			prop_idx = CONNECTOR_PROP_HBM;
+		else {
+			SDE_ERROR("Invalid param_name =%s\n",
+						param_cmds->param_name);
+			return -EINVAL;
+		}
+
+		if (param_cmds->is_supported)
+			msm_property_install_volatile_range(
+					&c_conn->property_info,
+					param_cmds->param_name,
+					0x0, 0, param_cmds->val_max,
+					param_cmds->default_value, prop_idx);
+
+		param_cmds++;
+	}
+
+	return 0;
+}
+
 int sde_connector_set_blob_data(struct drm_connector *conn,
 		struct drm_connector_state *state,
 		enum msm_mdp_conn_property prop_id)
@@ -2683,6 +2748,14 @@ struct drm_connector *sde_connector_init(struct drm_device *dev,
 		}
 	}
 
+	rc = sde_connector_install_panel_params(c_conn);
+	if (rc) {
+		SDE_ERROR_CONN(c_conn,
+			"failed to install property for panel params. rc =%d\n",
+							rc);
+			goto error_cleanup_fence;
+	}
+
 	rc = sde_connector_get_info(&c_conn->base, &display_info);
 	if (!rc && (connector_type == DRM_MODE_CONNECTOR_DSI) &&
 			(display_info.capabilities & MSM_DISPLAY_CAP_VID_MODE))
diff --git a/msm/sde/sde_connector.h b/msm/sde/sde_connector.h
index c2c21428e453..0c9cef26cc27 100644
--- a/msm/sde/sde_connector.h
+++ b/msm/sde/sde_connector.h
@@ -284,6 +284,13 @@ struct sde_connector_ops {
 	 */
 	bool (*force_esd_disable)(void *display);
 
+	/**
+	 * set_param - set display's feature param setting
+	 * @display: Pointer to private display handle
+	 * Returns: Zero for success, negative for failure
+	 */
+	int (*set_param)(void *display, struct msm_param_info *param_info);
+
 	/**
 	 * 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 4ba78711d45d..fd91532fd91d 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -1438,6 +1438,7 @@ static int _sde_kms_setup_displays(struct drm_device *dev,
 		.motUtil_transfer = dsi_display_motUtil_transfer,
 		.cmd_transfer = dsi_display_cmd_transfer,
 		.force_esd_disable = dsi_display_force_esd_disable,
+		.set_param = dsi_display_set_param,
 		.cont_splash_config = dsi_display_cont_splash_config,
 		.get_panel_vfp = dsi_display_get_panel_vfp,
 		.get_default_lms = dsi_display_get_default_lms,
@@ -1456,6 +1457,7 @@ static int _sde_kms_setup_displays(struct drm_device *dev,
 		.check_status = NULL,
 		.cmd_transfer = NULL,
 		.force_esd_disable = NULL,
+		.set_param = NULL,
 		.cont_splash_config = NULL,
 		.get_panel_vfp = NULL,
 	};
@@ -1474,6 +1476,7 @@ static int _sde_kms_setup_displays(struct drm_device *dev,
 		.config_hdr = dp_connector_config_hdr,
 		.cmd_transfer = NULL,
 		.force_esd_disable = NULL,
+		.set_param = NULL,
 		.cont_splash_config = NULL,
 		.get_panel_vfp = NULL,
 		.update_pps = dp_connector_update_pps,

From a07dfdc7ca6cc7accc251e7a5bdf91ef9ef8d4c8 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 20 Aug 2019 14:22:52 -0500
Subject: [PATCH 20/94] disp: msm: Adding KMS property testing for motUtil tool

Adding the KMS property (HBM/ACL) testing functionality to
motUtil tool so these KMS property can be tested and verified as
standalone without supporting of the Android FW apk.

Port from: b345943

Change-Id: I825a1450f5b151025cc005fe45748bbae40c30bc
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444401
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509803
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c     |  40 +++++++---
 msm/dsi/dsi_panel.h     |   5 ++
 msm/msm_drv.h           |   7 ++
 msm/sde/sde_connector.c |  26 +++++--
 msm/sde/sde_motUtil.c   | 161 ++++++++++++++++++++++++++++++++++------
 msm/sde/sde_motUtil.h   |  89 +++++++++++++++++++++-
 6 files changed, 285 insertions(+), 43 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 52cbef5f41af..36185ba2f8b5 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -106,8 +106,11 @@ static struct panel_param_val_map hbm_map[HBM_STATE_NUM] = {
 	{HBM_ON_STATE, DSI_CMD_SET_HBM_ON, NULL},
 };
 
-static struct panel_param dsi_panel_param[PARAM_ID_NUM] = {
-	{"HBM", hbm_map, HBM_STATE_NUM, HBM_OFF_STATE, HBM_OFF_STATE, false},
+static struct panel_param dsi_panel_param[PANEL_IDX_MAX][PARAM_ID_NUM] = {
+	{
+		{"HBM", hbm_map, HBM_STATE_NUM, HBM_OFF_STATE,
+				HBM_OFF_STATE, false},
+	},
 };
 
 int dsi_dsc_create_pps_buf_cmd(struct msm_display_dsc_info *dsc, char *buf,
@@ -839,7 +842,7 @@ static int dsi_panel_pwm_register(struct dsi_panel *panel)
 	return 0;
 }
 
-static int dsi_panel_send_param_cmd (struct dsi_panel *panel,
+static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
                                 struct msm_param_info *param_info)
 {
 	int rc = 0;
@@ -874,6 +877,12 @@ static int dsi_panel_send_param_cmd (struct dsi_panel *panel,
 		param_map = panel->param_cmds[param_info->param_idx].val_map;
 		param_map_state = &param_map[param_info->value];
 
+		if (!param_map_state->cmds || !param_map_state->cmds->cmds) {
+			DSI_ERR("Invalid cmds or cmds->cmds\n");
+			rc = -EINVAL;
+			goto end;
+		}
+
 		cmds = param_map_state->cmds->cmds;
 		if (param_map_state->cmds->state == DSI_CMD_SET_STATE_LP)
 			cmds->msg.flags |= MIPI_DSI_MSG_USE_LPM |
@@ -3538,7 +3547,7 @@ end:
 }
 
 static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
-					struct device_node *of_node)
+				struct device_node *of_node, u32 param_idx)
 {
 	int i, j, rc =0;
 	struct panel_param *param;
@@ -3549,9 +3558,15 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 	struct dsi_parser_utils *utils = &panel->utils;
 
 	for (i = 0; i < PARAM_ID_NUM; i++) {
-		param = &dsi_panel_param[i];
+		param = &dsi_panel_param[param_idx][i];
 
-		for (j = 0; j < param->val_max; j++) {
+		if (!param) {
+			pr_err("Invalid param\n");
+			goto err;
+		}
+
+		rc = -EINVAL;
+		for (j = 0; j < param->val_max && param->val_max > 0 ; j++) {
 			param_map = &param->val_map[j];
 			param_map->cmds = NULL;
 			cmds = kcalloc(param->val_max,
@@ -3577,15 +3592,17 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 			}
 		}
 
-		param->is_supported = true;
-		DSI_INFO("%s: feature enabled.\n", param->param_name);
+		if (!rc) {
+			param->is_supported = true;
+			DSI_INFO("%s: feature enabled.\n", param->param_name);
+		}
 	}
 
 	return rc;
 
 parse_err:
 	for (i = 0; i < ARRAY_SIZE(dsi_panel_param); i++) {
-		param = &dsi_panel_param[i];
+		param = &dsi_panel_param[param_idx][i];
 		for (j = 0; j < param->val_max; j++) {
 			if (param->val_map[j].cmds) {
 				kfree(param->val_map[j].cmds);
@@ -3695,6 +3712,7 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 	struct dsi_parser_utils *utils;
 	const char *panel_physical_type;
 	int rc = 0;
+	u32 param_idx = 0; /* Since only panel support for now */
 
 	panel = kzalloc(sizeof(*panel), GFP_KERNEL);
 	if (!panel)
@@ -3725,8 +3743,8 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 	if (rc)
 		DSI_DEBUG("failed to parse mot_panel_config, rc = %d\n", rc);
 
-	panel->param_cmds = &dsi_panel_param[0];
-	rc = dsi_panel_parse_param_prop(panel, of_node);
+	panel->param_cmds = dsi_panel_param[param_idx];
+	rc = dsi_panel_parse_param_prop(panel, of_node, param_idx );
 	if (rc)
 		pr_debug("failed to parse panel param prop, rc =%d\n", rc);
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index dbdcb1ad94b2..b02cff6edf61 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -178,6 +178,11 @@ struct drm_panel_esd_config {
 	u32 groups;
 };
 
+enum panel_idx {
+        MAIN_IDX = 0,
+        PANEL_IDX_MAX,
+};
+
 enum hbm_state {
 	HBM_OFF_STATE = 0,
 	HBM_ON_STATE,
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 44210badce15..04c5d57fd80c 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -312,6 +312,13 @@ struct msm_roi_caps {
 	struct msm_roi_alignment align;
 };
 
+enum msm_param_state {
+	PARAM_STATE_OFF = 0,
+	PARAM_STATE_ON,
+	PARAM_STATE_NUM,
+	PARAM_STATE_DISABLE = 0xFFFF,
+};
+
 enum msm_param_id {
 	PARAM_HBM_ID = 0,
 	PARAM_ID_NUM
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 0f53f9da4ec9..b98a0a34c7ed 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1495,7 +1495,9 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 				connector->state, CONNECTOR_PROP_HBM);
 		param_info.param_idx = PARAM_HBM_ID;
 		param_info.param_conn_idx = CONNECTOR_PROP_HBM;
-		_sde_connector_update_param(c_conn, &param_info);
+		rc = _sde_connector_update_param(c_conn, &param_info);
+		if (rc)
+			goto end;
 		break;
 	default:
 		break;
@@ -2385,7 +2387,7 @@ static int sde_connector_install_panel_params(struct sde_connector *c_conn)
 	uint32_t prop_idx;
 	int i;
 	struct dsi_display *dsi_display;
-
+	u16 prop_max, prop_min, prop_init;
 
 	if (c_conn->connector_type != DRM_MODE_CONNECTOR_DSI)
 		return 0;
@@ -2405,12 +2407,20 @@ static int sde_connector_install_panel_params(struct sde_connector *c_conn)
 			return -EINVAL;
 		}
 
-		if (param_cmds->is_supported)
-			msm_property_install_volatile_range(
-					&c_conn->property_info,
-					param_cmds->param_name,
-					0x0, 0, param_cmds->val_max,
-					param_cmds->default_value, prop_idx);
+		if (param_cmds->is_supported) {
+			prop_max = param_cmds->val_max;
+			prop_min = PARAM_STATE_OFF;
+			prop_init = param_cmds->default_value;
+		} else {
+			prop_max = PARAM_STATE_OFF;
+			prop_min = PARAM_STATE_OFF;
+			prop_init = PARAM_STATE_DISABLE;
+		}
+
+		msm_property_install_volatile_range( &c_conn->property_info,
+					param_cmds->param_name, 0x0,
+					prop_min, prop_max,
+					prop_init, prop_idx);
 
 		param_cmds++;
 	}
diff --git a/msm/sde/sde_motUtil.c b/msm/sde/sde_motUtil.c
index ef41494c76da..d33f11222533 100644
--- a/msm/sde/sde_motUtil.c
+++ b/msm/sde/sde_motUtil.c
@@ -61,6 +61,7 @@ static ssize_t _sde_debugfs_motUtil_string2num(const char __user *buf,
 	while (token) {
 		rc = kstrtoint(token, 0, &strtoint);
 		if (rc) {
+			rc = -EIO;
 			SDE_ERROR("input buffer conversion failed\n");
 			goto end;
 		}
@@ -84,13 +85,12 @@ end:
 	return rc;
 }
 
-static struct sde_connector *_sde_debugfs_motUtil_get_sde_conn(
+static struct drm_connector *_sde_debugfs_motUtil_get_drm_conn(
 					struct sde_kms *kms,
 					size_t count, char input[])
 {
 	struct drm_device *dev = kms->dev;
 	struct drm_connector *conn = NULL;
-	struct sde_connector *sde_conn = NULL;
 	int found_conn = 0;
 	enum sde_motUtil_disp_cmd panel_type = input[DISPUTIL_PANEL_TYPE];
 	struct drm_connector_list_iter conn_iter;
@@ -113,20 +113,30 @@ static struct sde_connector *_sde_debugfs_motUtil_get_sde_conn(
 		}
 	}
 
-	if (found_conn) {
-		SDE_DEBUG("found SDE Connector for %s\n",
-			(panel_type == MOTUTIL_MAIN_DISP) ?
-				"Main Display" : "CLI Display");
-				sde_conn = to_sde_connector(conn);
-	} else {
-		SDE_ERROR("Can not find SDE Connector for %s\n",
-				(panel_type == MOTUTIL_MAIN_DISP) ?
-				"Main Display" : "CLI Display");
-	}
-
 	drm_connector_list_iter_end(&conn_iter);
 	mutex_unlock(&dev->mode_config.mutex);
 
+	if (found_conn)
+		return conn;
+	else
+		return NULL;
+}
+
+static struct sde_connector *_sde_debugfs_motUtil_get_sde_conn(
+						struct sde_kms *kms,
+						size_t count, char input[])
+{
+	struct drm_connector *conn = NULL;
+	struct sde_connector *sde_conn = NULL;
+
+	conn = _sde_debugfs_motUtil_get_drm_conn(kms, count, input);
+	if (conn)
+		sde_conn = to_sde_connector(conn);
+	else
+		DRM_ERROR("Can not find SDE Connector for %s\n",
+			(input[DISPUTIL_PANEL_TYPE] == MOTUTIL_MAIN_DISP) ?
+			"Main Display" : "CLI Display");
+
 	return sde_conn;
 }
 
@@ -159,7 +169,7 @@ static int _sde_debugfs_motUtil_transfer(struct sde_kms *kms,
 		mutex_lock(&sde_conn->lock);
 		ret = sde_conn->ops.motUtil_transfer(sde_conn->display,
 						input,	count, &motUtil_data);
-		motUtil_data.last_cmd_tx_status = !ret ? true : false;
+		motUtil_data.cmd_status = ret;
 		motUtil_data.read_len = ret;
 		mutex_unlock(&sde_conn->lock);
 
@@ -171,6 +181,98 @@ end:
 }
 
 
+static int _sde_debugfs_motUtil_kms_prop_test(struct sde_kms *kms,
+					size_t count, char input[])
+{
+	struct drm_connector *conn = NULL;
+	struct sde_connector *sde_conn = NULL;
+	struct drm_property *property;
+
+	int ret = 0;
+	enum msm_mdp_conn_property conn_prop_idx;
+	uint64_t prop_val;
+
+	conn = _sde_debugfs_motUtil_get_drm_conn(kms, count, input);
+	if (!conn) {
+		ret = -EINVAL;
+		goto end;
+	}
+
+	sde_conn = to_sde_connector(conn);
+	if (!sde_conn) {
+		ret = -EINVAL;
+		goto end;
+	}
+
+	if (count < KMSPROPTEST_NEW_VAL) {
+		DRM_ERROR(" Number of Input data is invalid (%zu).\n", count);
+		ret = -EINVAL;
+		goto end;
+        }
+
+	switch (input[KMSPROPTEST_PROP_INDEX]) {
+		case KMSPROPTEST_TYPE_HBM:
+			conn_prop_idx = CONNECTOR_PROP_HBM;
+			break;
+/*		case KMSPROPTEST_TYPE_ACL:
+			conn_prop_idx = CONNECTOR_PROP_ACL;
+			break;
+*/
+		default:
+			DRM_ERROR(" Invalid KMSPROPTEST_PROP_INDEX = %d\n",
+						input[KMSPROPTEST_PROP_INDEX]);
+			ret = -EINVAL;
+			break;
+	}
+
+	if (ret)
+		goto end;
+
+	property = msm_property_index_to_drm_property(&sde_conn->property_info,
+							conn_prop_idx);
+	if (!property) {
+		SDE_ERROR("invalid property index %d for sde_conn_name=%s\n",
+				conn_prop_idx, sde_conn->name);
+		ret = -EINVAL;
+		goto end;
+	}
+
+	prop_val = sde_connector_get_property(conn->state, conn_prop_idx);
+	if (prop_val == PARAM_STATE_DISABLE) {
+		DRM_ERROR("This KMS Property=%d is disabled\n", conn_prop_idx);
+		ret = -EPERM;
+		goto end;
+	}
+
+	switch(input[KMSPROPTEST_PROP_TYPE]) {
+		case KMSPROPTEST_GETPROP:
+			motUtil_data.read_cmd = true;
+			motUtil_data.val = (int)prop_val;
+			break;
+		case KMSPROPTEST_SETPROP:
+			motUtil_data.read_cmd = false;
+			if (conn->funcs && conn->funcs->atomic_set_property) {
+				ret = conn->funcs->atomic_set_property(conn,
+					conn->state, property,
+					input[KMSPROPTEST_NEW_VAL]);
+			} else {
+				ret = -EINVAL;
+				DRM_ERROR("Unsupport KMS set property\n");
+			}
+
+			break;
+		default:
+			DRM_ERROR("Invalid KMSPROPTEST_PROP_TYPE = %d\n",
+					input[KMSPROPTEST_PROP_TYPE]);
+			ret = -EINVAL;
+			break;
+	}
+
+end:
+	motUtil_data.cmd_status = ret;
+	return ret;
+}
+
 static ssize_t _sde_debugfs_motUtil_exe_command(struct sde_kms *kms,
 					size_t count, char input[])
 {
@@ -182,6 +284,9 @@ static ssize_t _sde_debugfs_motUtil_exe_command(struct sde_kms *kms,
 	case MOTUTIL_DISP_UTIL:
 		ret = _sde_debugfs_motUtil_transfer(kms, count, input);
 		break;
+	case MOTUTIL_KMS_PROP_TEST:
+		ret = _sde_debugfs_motUtil_kms_prop_test(kms, count, input);
+		break;
 	default:
 		SDE_ERROR("Un-support motUtil type = %d\n", motUtil_type);
 		ret = -EINVAL;
@@ -207,22 +312,26 @@ static ssize_t _sde_debugfs_motUtil_write(struct file *file,
 	u32 buf_size = 0;
 	char buffer[MAX_CMD_PAYLOAD_SIZE];
 	struct sde_kms *kms = (struct sde_kms *)file->private_data;
+	int ret = 0;
 
 	if (*ppos || !kms) {
 		SDE_ERROR("invalid argument(s)\n");
-		return 0;
+		ret = -EINVAL;
+		goto end;
 	}
 
 	buf_size = _sde_debugfs_motUtil_string2num(buf, count, buffer);
-	if (!buf_size){
+	if (buf_size <= 0){
 		SDE_ERROR("invalid input\n");
-		return count;
+		ret = -EINVAL;
+		goto end;
 	}
 
 	mutex_lock(&motUtil_data.lock);
-	_sde_debugfs_motUtil_exe_command(kms, count, buffer);
+	ret = _sde_debugfs_motUtil_exe_command(kms, count, buffer);
 	mutex_unlock(&motUtil_data.lock);
-
+end:
+	motUtil_data.cmd_status = ret;
 	return count;
 }
 
@@ -253,13 +362,19 @@ static ssize_t _sde_debugfs_motUtil_read(struct file *file,
 		return 0;
 
 	mutex_lock(&motUtil_data.lock);
-	if (!motUtil_data.read_cmd) {
+	if (motUtil_data.cmd_status < 0 || !motUtil_data.read_cmd) {
 		blen = snprintf(buffer, MAX_CMD_PAYLOAD_SIZE,
-			"motUtil_status: 0x%x\n",
-			motUtil_data.last_cmd_tx_status);
+					"motUtil_status: %d\n",
+					motUtil_data.cmd_status);
 	} else if (motUtil_data.motUtil_type == MOTUTIL_DISP_UTIL) {
 			blen = _sde_debugfs_motUtil_dispUtil_read(buffer);
-	}
+	} else if (motUtil_data.motUtil_type == MOTUTIL_KMS_PROP_TEST) {
+                blen = snprintf(buffer, 16, "motUtil_read: ");
+                blen += snprintf((buffer + blen), 12, "0x%08x ",
+                                                        motUtil_data.val);
+                blen += snprintf((buffer + blen), 2, "\n");
+        }
+
 
         SDE_INFO("%s\n", buffer);
 
diff --git a/msm/sde/sde_motUtil.h b/msm/sde/sde_motUtil.h
index bc83b35e5d77..329977ae6ac1 100644
--- a/msm/sde/sde_motUtil.h
+++ b/msm/sde/sde_motUtil.h
@@ -18,8 +18,78 @@
 #include <linux/debugfs.h>
 #include <linux/types.h>
 
+/*****************************************************************************
+ * /d/dri/0/debug/motUtil sysfs                                              *
+ * - This is Mot debug sysfs to provide some tools to test panel and panel   *
+ *   features. This tool only exist with the userdebug and Engineering build *
+ * - Currently, this motUtil will provide 3 kind of tests and it can enhance *
+ *   to test more if needed                                                  *
+ *   - Test#1: DispUtil: This test is able to send any MIPI DSI command and  *
+ *             it can read any data back from the panel                      *
+ *   - Test#2: TeTest: This test will be used to test the TE trace between   *
+ *             the panels and MDSS to make sure it works                     *
+ *   - Test#3: kmsPropTest: This test will test the panel features such as   *
+ *             HBM, ACL, CABC, etc. It can read these features configurations*
+ *             in the KMS property and it can change these setting from KMS  *
+ *             property.                                                     *
+ * - Usage:                                                                  *
+ *   - 1st byte will indicate which motUtil test will be run.                *
+ *           0x00 = dispUtil, 0x01 = TeTest, 0x02 = kmsPropTest              *
+ * --------------------------------------------------------------------------*
+ *   - dispUtil:                                                             *
+ *     1st byte: 0x00: dispUtil                                              *
+ *     2nd byte: 0x00: primary panel and 0x01: Secondary panel               *
+ *     3rd byte: 0x00: MIPI write cmd to panel and 0x01: MIPI read           *
+ *     4th byte: 0x00: MIPI HS mode and 0x01: MIPI LP mode                   *
+ *     5th byte: 0x00: MIPI DCS cmd and 0x01: MIPI generaic cmd              *
+ *     6th byte: Indicate number of bytes to read from panel                 *
+ *     7th and 8th: Indicate number of bytes for the payload cmd             *
+ *     9th and .. :the payload cmd                                           *
+ *     - Example:                                                            *
+ *     echo "0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x01 0x28" > motUtil         *
+ *       - This will send a mipi DSC command "0x28" to panel and             *
+ *         which will request the panel to turn off the panel                *
+ *     cat motUtil                                                           *
+ *       - This will report a sending previous cmd status                    *
+ *         0: send success or errno if it fails                              *
+ *     echo "0x00 0x01 0x01 0x00 0x00 0x01 0x00 0x01 0x0a" > motUtil         *
+ *       - This will send MIPI read cmd "0xa" to the panel.                  *
+ *     cat motUtil                                                           *
+ *       - number of reading bytes from previous command or errno if it fails*
+ *---------------------------------------------------------------------------*
+ *  - TeTest: This test has been removed                                     *
+ *---------------------------------------------------------------------------*
+ *  - kmsPropTest                                                            *
+ *    1st byte: kmsPropTest                                                  *
+ *    2nd byte: 0x00: primary panel and 0x01: Secondary panel                *
+ *    3rd byte: 0x00: get KMS property and 0x01: set KMS property            *
+ *    4th byte: 0x00: HBM 0x01: ACL for the KMS property/panel feature       *
+ *    5th byte: new data for a "set KMS property" operation                  *
+ *    - Example                                                              *
+ *    echo "0x02 0x00 0x010 0x00 0x00" > motUtil                             *
+ *      - This will read the HBM setting of the primary panel in the KMS     *
+ *        property.                                                          *
+ *    cat motUtil                                                            *
+ *     - This will return the status of previous cmd.                        *
+ *         0 if success or errno if it fails                                 *
+ *     echo "0x02 0x00 0x01 0x00 0x01" > motUtil                             *
+ *      - This will turn on the HBM feature of the primary panel in the KMS  *
+ *        property. The panel's backlight will be brighter when HBM is on    *
+ *    cat motUtil                                                            *
+ *     - This will return the status of previous cmd.                        *
+ *         0 if success or errno if it fails                                 *
+ *    echo "0x02 0x00 0x010 0x00 0x00" > motUtil                             *
+ *     - This will read back the HBM setting in KMS property                 *
+ *    echo "0x02 0x00 0x01 0x00 0x00" > motUtil                              *
+ *      - This will turn off the HBM feature of the primary panel in the KMS *
+ *        property. The panel's backlight will be dimmer when HBM is off     *
+ *                                                                           *
+ ****************************************************************************/
+
 enum sde_motUtil_type {
         MOTUTIL_DISP_UTIL = 0,
+	MOTUTIL_TE_TEST,
+	MOTUTIL_KMS_PROP_TEST,
 };
 
 enum sde_motUtil_disp_cmd {
@@ -34,11 +104,25 @@ enum sde_motUtil_disp_cmd {
 	DISPUTIL_PAYLOAD,
 };
 
+enum sde_motUtil_kmsPropTest_cmd {
+	KMSPROPTEST_TYPE,
+	KMSPROPTEST_PANEL_TYPE,
+	KMSPROPTEST_PROP_TYPE,
+	KMSPROPTEST_PROP_INDEX,
+	KMSPROPTEST_NEW_VAL,
+};
+
+enum sde_motUtil_kmsPropTest_ConnPropType {
+	KMSPROPTEST_TYPE_HBM,
+	KMSPROPTEST_TYPE_ACL,
+	KMSPROPTEST_TYPE_CABC,
+};
+
 struct motUtil {
 	struct mutex lock;
 	enum sde_motUtil_type motUtil_type;
 	bool read_cmd;
-	bool last_cmd_tx_status;
+	int cmd_status;
 	u16 read_len;
 	u8 *rd_buf;
 	int val;
@@ -54,6 +138,9 @@ struct motUtil {
 #define DISPUTIL_DSI_HS_MODE    0
 #define DISPUTIL_DSI_LP_MODE    1
 
+#define KMSPROPTEST_GETPROP	0
+#define KMSPROPTEST_SETPROP	1
+
 #define MOTUTIL_MAIN_DISP	0
 #define MOTUTIL_CLI_DISP	1
 

From e51b9ece316415f3ccd0ec0e14a605cdee7c8f20 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 2 May 2019 15:40:42 -0500
Subject: [PATCH 21/94] disp: msm: Correct the panel's LP11_INIT

QCOM has panel's LP11_INIT implementation, but it doesn't meet MOT's
panel spec.

Here is QCOM's implementaion:
- Init the DSI PHY, Turn on panel's POWER, Toggle Reset, and sending
  MIPI commands

Here is MOT's LP11_INIT panel spec:
- Init the DSI PHY ( MIPI lines in LP00), Turn on panel POWER,
  Bring MIPI lines to LP11, Toggle Reset, Sending MIPI commands

Port from: 4cea9bb

Change-Id: I0979e4bcb3c8f0404e6e4b1f2011256394626f31
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444414
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509804
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c |  3 +-
 msm/dsi/dsi_panel.c   | 64 ++++++++++++++++++++++++-------------------
 msm/dsi/dsi_panel.h   |  2 ++
 3 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index c13dab6a23ab..8ad821723f2c 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -7574,7 +7574,8 @@ error_ctrl_clk_off:
 	(void)dsi_display_clk_ctrl(display->dsi_clk_handle,
 			DSI_CORE_CLK, DSI_CLK_OFF);
 error_panel_post_unprep:
-	(void)dsi_panel_post_unprepare(display->panel);
+	if (!display->is_cont_splash_enabled)
+		(void)dsi_panel_post_unprepare(display->panel);
 error:
 	mutex_unlock(&display->display_lock);
 	SDE_EVT32(SDE_EVTLOG_FUNC_EXIT);
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 36185ba2f8b5..a432c0a63909 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -374,12 +374,13 @@ int dsi_panel_trigger_esd_attack(struct dsi_panel *panel)
 	return -EINVAL;
 }
 
-static int dsi_panel_reset(struct dsi_panel *panel)
+int dsi_panel_reset(struct dsi_panel *panel)
 {
 	int rc = 0;
 	struct dsi_panel_reset_config *r_config = &panel->reset_config;
 	int i;
 
+	DSI_DEBUG("++\n");
 	if (gpio_is_valid(panel->reset_config.disp_en_gpio)) {
 		rc = gpio_direction_output(panel->reset_config.disp_en_gpio, 1);
 		if (rc) {
@@ -483,23 +484,8 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 		goto error_disable_vregs;
 	}
 
-	rc = dsi_panel_reset(panel);
-	if (rc) {
-		DSI_ERR("[%s] failed to reset panel, rc=%d\n", panel->name, rc);
-		goto error_disable_gpio;
-	}
-
 	goto exit;
 
-error_disable_gpio:
-	if (gpio_is_valid(panel->reset_config.disp_en_gpio))
-		gpio_set_value(panel->reset_config.disp_en_gpio, 0);
-
-	if (gpio_is_valid(panel->bl_config.en_gpio))
-		gpio_set_value(panel->bl_config.en_gpio, 0);
-
-	(void)dsi_panel_set_pinctrl_state(panel, false);
-
 error_disable_vregs:
 	(void)dsi_pwr_enable_regulator(&panel->power_info, false);
 
@@ -4359,14 +4345,17 @@ int dsi_panel_pre_prepare(struct dsi_panel *panel)
 
 	mutex_lock(&panel->panel_lock);
 
-	/* If LP11_INIT is set, panel will be powered up during prepare() */
-	if (panel->lp11_init)
-		goto error;
-
-	rc = dsi_panel_power_on(panel);
-	if (rc) {
-		DSI_ERR("[%s] panel power on failed, rc=%d\n", panel->name, rc);
-		goto error;
+	/*
+	 * If LP11_INIT is set, panel will be powered up here, not during
+	 * prepare(), but panel's reset will be called later, in prepare call.
+	 */
+	if (panel->lp11_init) {
+		rc = dsi_panel_power_on(panel);
+		if (rc) {
+			DSI_ERR("[%s] panel power on failed, rc=%d\n",
+						panel->name, rc);
+			goto error;
+		}
 	}
 
 error:
@@ -4507,23 +4496,42 @@ int dsi_panel_prepare(struct dsi_panel *panel)
 
 	mutex_lock(&panel->panel_lock);
 
-	if (panel->lp11_init) {
+	/* If LP11_INIT is not set, then panel will be powered here */
+	if (!panel->lp11_init) {
 		rc = dsi_panel_power_on(panel);
 		if (rc) {
 			DSI_ERR("[%s] panel power on failed, rc=%d\n",
 			       panel->name, rc);
-			goto error;
+			goto end;
 		}
 	}
 
+	rc = dsi_panel_reset(panel);
+	if (rc) {
+		DSI_ERR("[%s] panel reset failed, rc=%d\n", panel->name, rc);
+		goto error_disable_gpio;
+	}
+
 	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_PRE_ON);
 	if (rc) {
 		DSI_ERR("[%s] failed to send DSI_CMD_SET_PRE_ON cmds, rc=%d\n",
 		       panel->name, rc);
-		goto error;
+		goto error_disable_gpio;
 	}
 
-error:
+	goto end;
+error_disable_gpio:
+	if (gpio_is_valid(panel->reset_config.disp_en_gpio))
+		gpio_set_value(panel->reset_config.disp_en_gpio, 0);
+
+	if (gpio_is_valid(panel->bl_config.en_gpio))
+		gpio_set_value(panel->bl_config.en_gpio, 0);
+
+	if (!panel->lp11_init) {
+		(void)dsi_panel_set_pinctrl_state(panel, false);
+		(void)dsi_pwr_enable_regulator(&panel->power_info, false);
+	}
+end:
 	mutex_unlock(&panel->panel_lock);
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index b02cff6edf61..6a2d38d0bcd2 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -338,6 +338,8 @@ int dsi_panel_set_nolp(struct dsi_panel *panel);
 
 int dsi_panel_prepare(struct dsi_panel *panel);
 
+int dsi_panel_reset(struct dsi_panel *panel);
+
 int dsi_panel_enable(struct dsi_panel *panel);
 
 int dsi_panel_post_enable(struct dsi_panel *panel);

From 56c54021867ac29de6004189f2677f009e1fb463 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 20 Aug 2019 15:00:13 -0500
Subject: [PATCH 22/94] disp: msm: provide API to query for panel enable state

This dsi_display_is_panel_enable(int panel_index) API will take in
panel_index equal 0 for Primary and 1 for Seconday display. It will
return TRUE if the panel is ON or FALSE when it's OFF

Port from: 255270c

Change-Id: Idbc4cc507336104d941a6b2868f9bdf47e5bdaa2
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444402
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509805
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c | 57 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 8ad821723f2c..d8732f6ae0f8 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -7844,6 +7844,59 @@ int dsi_display_pre_commit(void *display,
 	return rc;
 }
 
+/* start of MMI_STOPSHIP section */
+struct dsi_enable_status {
+	struct dsi_display *display;
+	bool enable;
+};
+
+static struct dsi_enable_status enable_status[2];
+
+static int dsi_display_enable_status (struct dsi_display *display, bool enable)
+{
+	int ret = 0;
+
+	if (!strncmp("DSI-1", display->drm_conn->name, 5)) {
+		DSI_DEBUG("display->drm_conn->name=%s enable = %d MAIN_DISPLAY\n",
+			display->drm_conn->name, enable);
+		enable_status[0].display = display;
+		enable_status[0].enable = enable;
+	} else if (!strncmp("DSI-2", display->drm_conn->name, 5)) {
+                DSI_DEBUG("display->drm_conn->name=%s enable = %d CLI_DISPLAY\n",
+			display->drm_conn->name, enable);
+		enable_status[1].display = display;
+		enable_status[1].enable = enable;
+	} else {
+		DSI_ERR(" Invalid display->drm_conn->name = %s\n",
+					display->drm_conn->name);
+		ret =  -EINVAL;
+	}
+
+	return ret;
+}
+
+bool dsi_display_is_panel_enable (int panel_index)
+{
+	struct dsi_display *display;
+	bool enable = false;
+
+	if (panel_index > 1) {
+		pr_err("Invalid panel index =%d\n", panel_index);
+		return false;
+	}
+
+	display = enable_status[panel_index].display;
+	if (display) {
+		mutex_lock(&display->display_lock);
+		enable = enable_status[panel_index].enable;
+		mutex_unlock(&display->display_lock);
+	}
+
+	return enable;
+}
+EXPORT_SYMBOL(dsi_display_is_panel_enable);
+/* end of MMI_STOPSHIP section */
+
 int dsi_display_enable(struct dsi_display *display)
 {
 	int rc = 0;
@@ -7898,6 +7951,8 @@ int dsi_display_enable(struct dsi_display *display)
 			       display->name, rc);
 			goto error;
 		}
+
+		dsi_display_enable_status(display, true);
 	}
 
 	/* Block sending pps command if modeset is due to fps difference */
@@ -8064,6 +8119,8 @@ int dsi_display_disable(struct dsi_display *display)
 	if (rc)
 		DSI_ERR("[%s] display wake up failed, rc=%d\n",
 		       display->name, rc);
+	else
+		dsi_display_enable_status(display, false);
 
 	if (display->config.panel_mode == DSI_OP_VIDEO_MODE) {
 		rc = dsi_display_vid_engine_disable(display);

From 77367de2e1314451dccadaaece3c12f4c6797b83 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 21 Aug 2019 07:45:39 -0500
Subject: [PATCH 23/94] disp: msm: Report panel's probe status

Panel API need to report probe status in order for consumer to
determine panel's presence

Port from: 834d504

Change-Id: I971b6ea68f97fb047e0c3f62ec23ae042c4b21d6
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444403
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509806
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c | 44 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index d8732f6ae0f8..2a57703a249c 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -45,6 +45,8 @@ static const struct of_device_id dsi_display_dt_match[] = {
 	{}
 };
 
+static void dsi_display_is_probed(int enable_idx, int probe_status);
+
 static void dsi_display_mask_ctrl_error_interrupts(struct dsi_display *display,
 			u32 mask, bool enable)
 {
@@ -5636,6 +5638,7 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 	int rc = 0, index = DSI_PRIMARY;
 	bool firm_req = false;
 	struct dsi_display_boot_param *boot_disp;
+	int enable_idx;
 
 	if (!pdev || !pdev->dev.of_node) {
 		DSI_ERR("pdev not found\n");
@@ -5659,11 +5662,15 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 
 	display->display_type = of_get_property(pdev->dev.of_node,
 				"label", NULL);
-	if (!display->display_type)
+	if (!display->display_type) {
 		display->display_type = "primary";
+		enable_idx = 0;
+	}
 
-	if (!strcmp(display->display_type, "secondary"))
+	if (!strcmp(display->display_type, "secondary")) {
 		index = DSI_SECONDARY;
+		enable_idx = 1;
+	}
 
 	boot_disp = &boot_displays[index];
 	node = pdev->dev.of_node;
@@ -5716,6 +5723,8 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 		rc = dsi_display_init(display);
 		if (rc)
 			goto end;
+		else
+			dsi_display_is_probed(enable_idx, rc);
 	}
 
 	return 0;
@@ -7847,10 +7856,25 @@ int dsi_display_pre_commit(void *display,
 /* start of MMI_STOPSHIP section */
 struct dsi_enable_status {
 	struct dsi_display *display;
+	int probed;
 	bool enable;
 };
 
-static struct dsi_enable_status enable_status[2];
+static struct dsi_enable_status enable_status[2] = {
+	{
+		.probed = -ENODEV,
+	},
+	{
+		.probed = -ENODEV,
+	},
+};
+
+static void dsi_display_is_probed (int enable_idx, int probe_status)
+{
+	enable_status[enable_idx].probed = probe_status;
+	pr_debug("display->drm_conn[%d] probe set =%d\n",
+					enable_idx, probe_status);
+}
 
 static int dsi_display_enable_status (struct dsi_display *display, bool enable)
 {
@@ -7862,12 +7886,12 @@ static int dsi_display_enable_status (struct dsi_display *display, bool enable)
 		enable_status[0].display = display;
 		enable_status[0].enable = enable;
 	} else if (!strncmp("DSI-2", display->drm_conn->name, 5)) {
-                DSI_DEBUG("display->drm_conn->name=%s enable = %d CLI_DISPLAY\n",
+		DSI_DEBUG("display->drm_conn->name=%s enable = %d CLI_DISPLAY\n",
 			display->drm_conn->name, enable);
 		enable_status[1].display = display;
 		enable_status[1].enable = enable;
 	} else {
-		DSI_ERR(" Invalid display->drm_conn->name = %s\n",
+		DSI_ERR("display->drm_conn: invalid name =%s\n",
 					display->drm_conn->name);
 		ret =  -EINVAL;
 	}
@@ -7875,16 +7899,22 @@ static int dsi_display_enable_status (struct dsi_display *display, bool enable)
 	return ret;
 }
 
-bool dsi_display_is_panel_enable (int panel_index)
+bool dsi_display_is_panel_enable (int panel_index, int *probe_status)
 {
 	struct dsi_display *display;
 	bool enable = false;
 
 	if (panel_index > 1) {
-		pr_err("Invalid panel index =%d\n", panel_index);
+		pr_err("display->drm_conn: invalid panel index =%d\n",
+								panel_index);
+		if (probe_status)
+			*probe_status = -ENODEV;
 		return false;
 	}
 
+	if (probe_status)
+		*probe_status = enable_status[panel_index].probed;
+
 	display = enable_status[panel_index].display;
 	if (display) {
 		mutex_lock(&display->display_lock);

From 7dfd13f4f6ce7574c6eba72cbb6e088e8540004e Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Wed, 12 Sep 2018 09:14:56 -0500
Subject: [PATCH 24/94] disp: msm: Add panel name to enable status API

Adding a name to DSI panel enable status API

Port from: 19802f4

Change-Id: I250687024140431a2b408f869d09f56140503de5
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444404
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509807
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 2a57703a249c..2d40988948bf 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -45,7 +45,7 @@ static const struct of_device_id dsi_display_dt_match[] = {
 	{}
 };
 
-static void dsi_display_is_probed(int enable_idx, int probe_status);
+static void dsi_display_is_probed(int enable_idx, int probe_status, const char *pname);
 
 static void dsi_display_mask_ctrl_error_interrupts(struct dsi_display *display,
 			u32 mask, bool enable)
@@ -5724,7 +5724,7 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 		if (rc)
 			goto end;
 		else
-			dsi_display_is_probed(enable_idx, rc);
+			dsi_display_is_probed(enable_idx, rc, display->name);
 	}
 
 	return 0;
@@ -7858,6 +7858,7 @@ struct dsi_enable_status {
 	struct dsi_display *display;
 	int probed;
 	bool enable;
+	char pname[128];
 };
 
 static struct dsi_enable_status enable_status[2] = {
@@ -7869,11 +7870,14 @@ static struct dsi_enable_status enable_status[2] = {
 	},
 };
 
-static void dsi_display_is_probed (int enable_idx, int probe_status)
+static void dsi_display_is_probed (int enable_idx, int probe_status,
+					const char *pname)
 {
 	enable_status[enable_idx].probed = probe_status;
-	pr_debug("display->drm_conn[%d] probe set =%d\n",
-					enable_idx, probe_status);
+	strncpy(enable_status[enable_idx].pname, pname,
+			sizeof(enable_status[enable_idx].pname));
+	DSI_DEBUG("display->drm_conn[%d] set: probe =%d, name =%s\n",
+		enable_idx, probe_status, pname);
 }
 
 static int dsi_display_enable_status (struct dsi_display *display, bool enable)
@@ -7899,7 +7903,7 @@ static int dsi_display_enable_status (struct dsi_display *display, bool enable)
 	return ret;
 }
 
-bool dsi_display_is_panel_enable (int panel_index, int *probe_status)
+bool dsi_display_is_panel_enable (int panel_index, int *probe_status, char **pname)
 {
 	struct dsi_display *display;
 	bool enable = false;
@@ -7914,6 +7918,8 @@ bool dsi_display_is_panel_enable (int panel_index, int *probe_status)
 
 	if (probe_status)
 		*probe_status = enable_status[panel_index].probed;
+	if (pname)
+		*pname = &enable_status[panel_index].pname[0];
 
 	display = enable_status[panel_index].display;
 	if (display) {

From a6746e2c53eb688fa9e7786c0e626fa91e557396 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 18 Sep 2018 07:19:25 -0500
Subject: [PATCH 25/94] disp: msm: Set panel enable_status during probing

Set the panel's enable_status when the panel's cont_splash_enable
feature is set.

This dsi_display_enable_status() API will provide the panels
information such as the panel_name, probe information
and panels's enable/disable information to the touch driver.

Port from: e85045f

Change-Id: I3833ef7e9fbb9521060b1b84b87c9d3ce191e9a7
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444405
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509808
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 2d40988948bf..9a31e4246d97 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -45,7 +45,9 @@ static const struct of_device_id dsi_display_dt_match[] = {
 	{}
 };
 
-static void dsi_display_is_probed(int enable_idx, int probe_status, const char *pname);
+static int dsi_display_enable_status (struct dsi_display *display, bool enable);
+static void dsi_display_is_probed(struct dsi_display *display,
+					int probe_status);
 
 static void dsi_display_mask_ctrl_error_interrupts(struct dsi_display *display,
 			u32 mask, bool enable)
@@ -5466,6 +5468,7 @@ static int dsi_display_bind(struct device *dev,
 	}
 
 	DSI_INFO("Successfully bind display panel '%s'\n", display->name);
+	dsi_display_is_probed(display, 0);
 	display->drm_dev = drm;
 
 	display_for_each_ctrl(i, display) {
@@ -5638,7 +5641,6 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 	int rc = 0, index = DSI_PRIMARY;
 	bool firm_req = false;
 	struct dsi_display_boot_param *boot_disp;
-	int enable_idx;
 
 	if (!pdev || !pdev->dev.of_node) {
 		DSI_ERR("pdev not found\n");
@@ -5662,15 +5664,11 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 
 	display->display_type = of_get_property(pdev->dev.of_node,
 				"label", NULL);
-	if (!display->display_type) {
+	if (!display->display_type)
 		display->display_type = "primary";
-		enable_idx = 0;
-	}
 
-	if (!strcmp(display->display_type, "secondary")) {
+	if (!strcmp(display->display_type, "secondary"))
 		index = DSI_SECONDARY;
-		enable_idx = 1;
-	}
 
 	boot_disp = &boot_displays[index];
 	node = pdev->dev.of_node;
@@ -5723,8 +5721,6 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 		rc = dsi_display_init(display);
 		if (rc)
 			goto end;
-		else
-			dsi_display_is_probed(enable_idx, rc, display->name);
 	}
 
 	return 0;
@@ -7853,12 +7849,11 @@ int dsi_display_pre_commit(void *display,
 	return rc;
 }
 
-/* start of MMI_STOPSHIP section */
 struct dsi_enable_status {
 	struct dsi_display *display;
 	int probed;
 	bool enable;
-	char pname[128];
+	char pname[DSI_PANEL_MAX_PANEL_LEN];
 };
 
 static struct dsi_enable_status enable_status[2] = {
@@ -7870,14 +7865,23 @@ static struct dsi_enable_status enable_status[2] = {
 	},
 };
 
-static void dsi_display_is_probed (int enable_idx, int probe_status,
-					const char *pname)
+static void dsi_display_is_probed (struct dsi_display *display,
+					int probe_status)
+
 {
+	int enable_idx;
+
+	if (!display->display_type)
+		enable_idx = 0;
+
+	if (!strcmp(display->display_type, "secondary"))
+		enable_idx = 1;
+
 	enable_status[enable_idx].probed = probe_status;
-	strncpy(enable_status[enable_idx].pname, pname,
+	strncpy(enable_status[enable_idx].pname, display->name,
 			sizeof(enable_status[enable_idx].pname));
 	DSI_DEBUG("display->drm_conn[%d] set: probe =%d, name =%s\n",
-		enable_idx, probe_status, pname);
+			enable_idx, probe_status, display->name);
 }
 
 static int dsi_display_enable_status (struct dsi_display *display, bool enable)
@@ -7903,7 +7907,8 @@ static int dsi_display_enable_status (struct dsi_display *display, bool enable)
 	return ret;
 }
 
-bool dsi_display_is_panel_enable (int panel_index, int *probe_status, char **pname)
+bool dsi_display_is_panel_enable (int panel_index, int *probe_status,
+							char **pname)
 {
 	struct dsi_display *display;
 	bool enable = false;
@@ -7931,7 +7936,6 @@ bool dsi_display_is_panel_enable (int panel_index, int *probe_status, char **pna
 	return enable;
 }
 EXPORT_SYMBOL(dsi_display_is_panel_enable);
-/* end of MMI_STOPSHIP section */
 
 int dsi_display_enable(struct dsi_display *display)
 {
@@ -7963,6 +7967,7 @@ int dsi_display_enable(struct dsi_display *display)
 			return -EINVAL;
 		}
 
+		dsi_display_enable_status(display, 1);
 		display->panel->panel_initialized = true;
 		DSI_DEBUG("cont splash enabled, display enable not required\n");
 		return 0;

From 28d09dd7277dde42af27bece470314e7ff1ff11c Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 22 Aug 2019 08:35:43 -0500
Subject: [PATCH 26/94] disp: msm: Populate the passing panel's info from BL.

BL (bootloader/EUFI) will read the panel information such as panel's
ID and it will pass this information and panel's name in the devtree.
The display driver will populate these information and store in the
sysFS

Port from: 13ff4ce

Change-Id: I389d32ffad1097bf5a2d10517f2ad6f980923958
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444406
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509809
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c   |  8 ++++++++
 msm/dsi/dsi_panel.c     | 35 ++++++++++++++++++++---------------
 msm/dsi/dsi_panel.h     |  6 ++++--
 msm/msm_drv.h           |  8 ++++++++
 msm/sde/sde_connector.c | 29 +++++++++++++++++++++++++++++
 5 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 9a31e4246d97..c00b635f3d70 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -4094,6 +4094,9 @@ static int dsi_display_res_init(struct dsi_display *display)
 			display->panel->host_config.phy_type;
 	}
 
+	dsi_panel_parse_panel_cfg(display->panel,
+				!strcmp(display->display_type, "primary"));
+
 	rc = dsi_display_parse_lane_map(display);
 	if (rc) {
 		DSI_ERR("Lane map not found, rc=%d\n", rc);
@@ -6350,6 +6353,11 @@ int dsi_display_get_info(struct drm_connector *connector,
 		(display->panel->qsync_caps.qsync_min_fps_list_len > 0) ?
 		true : false;
 
+	info->panel_id = display->panel->panel_id;
+	info->panel_ver = display->panel->panel_ver;
+	strncpy(info->panel_name, display->panel->panel_name,
+				sizeof(display->panel->panel_name));
+
 	switch (display->panel->panel_mode) {
 	case DSI_OP_VIDEO_MODE:
 		info->curr_panel_mode = MSM_DISPLAY_VIDEO_MODE;
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index a432c0a63909..c633242b4e05 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1603,7 +1603,7 @@ static int dsi_panel_parse_dyn_clk_caps(struct dsi_panel *panel)
 	return 0;
 }
 
-static int dsi_panel_parse_panel_cfg(struct dsi_panel *panel)
+int dsi_panel_parse_panel_cfg(struct dsi_panel *panel, bool is_primary)
 {
 	struct device_node *np;
 	const char *pname;
@@ -1618,9 +1618,18 @@ static int dsi_panel_parse_panel_cfg(struct dsi_panel *panel)
 		panel->esd_utag_enable = true;
 
 	panel->panel_ver = DSI_PANEL_PANEL_DEFAULT_VER;
-	of_property_read_u64(np, "mmi,panel_ver", &panel->panel_ver);
+	panel->panel_id = DSI_PANEL_PANEL_DEFAULT_VER;
+
+	if (is_primary) {
+		of_property_read_u64(np, "mmi,panel_ver", &panel->panel_ver);
+		of_property_read_u64(np, "mmi,panel_id", &panel->panel_id);
+		pname = of_get_property(np, "mmi,panel_name", NULL);
+	} else {
+		of_property_read_u64(np, "mmi,panel_ver_s", &panel->panel_ver);
+		of_property_read_u64(np, "mmi,panel_id_s", &panel->panel_id);
+		pname = of_get_property(np, "mmi,panel_name_s", NULL);
+	}
 
-	pname = of_get_property(np, "mmi,panel_name", NULL);
 	if (!pname || strlen(pname) == 0) {
 		DSI_WARN("Failed to get mmi,panel_name\n");
 		strlcpy(panel->panel_name, DSI_PANEL_UNKNOWN_PANEL_NAME,
@@ -1631,13 +1640,15 @@ static int dsi_panel_parse_panel_cfg(struct dsi_panel *panel)
 	DSI_DEBUG("esd_utage_enable=%d\n", panel->esd_utag_enable);
 
 	panel_ver = (u32)panel->panel_ver;
-	DSI_INFO("BL: panel = %s, manufacture_id(0xDA) = 0x%x controller_ver(0xDB) = 0x%x controller_drv_ver(0XDC) = 0x%x, full = 0x%016llx\n",
-		panel->panel_name,
-		panel_ver & 0xff, (panel_ver & 0xff00) >> 8,
-		(panel_ver & 0xff0000) >> 16,
-		panel->panel_ver);
+	DSI_INFO("BL: panel(%s) =%s, panel_id =0x%016llx  panel_ver=0x%016llx\n",
+			is_primary? "primary": "secondary",
+			panel->panel_name, panel->panel_id, panel->panel_ver);
 
-		of_node_put(np);
+	DSI_INFO("BL: manufacture_id(0xDA) = 0x%x controller_ver(0xDB) = 0x%x controller_drv_ver(0XDC) = 0x%x\n",
+		panel_ver & 0xff, (panel_ver & 0xff00) >> 8,
+		(panel_ver & 0xff0000) >> 16);
+
+	of_node_put(np);
 
 	return 0;
 }
@@ -3748,12 +3759,6 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 		goto error;
 	}
 
-	rc = dsi_panel_parse_panel_cfg(panel);
-	if (rc) {
-		pr_err("failed to parse panel config from dts. rc=%d\n", rc);
-		goto error;
-	}
-
 	rc = dsi_panel_parse_dfps_caps(panel);
 	if (rc)
 		DSI_ERR("failed to parse dfps configuration, rc=%d\n", rc);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 6a2d38d0bcd2..10758912b490 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -28,7 +28,6 @@
 
 #define DSI_MODE_MAX 32
 
-
 /*
  * Defining custom dsi msg flag,
  * continued from drm_mipi_dsi.h
@@ -36,7 +35,7 @@
  */
 #define MIPI_DSI_MSG_ASYNC_OVERRIDE BIT(4)
 
-#define DSI_PANEL_MAX_PANEL_LEN	256
+#define DSI_PANEL_MAX_PANEL_LEN        128
 #define MAX_PARAM_NAME 10
 
 enum dsi_panel_rotation {
@@ -259,6 +258,7 @@ struct dsi_panel {
 	enum dsi_panel_physical_type panel_type;
 
 	bool esd_utag_enable;
+	u64 panel_id;
 	u64 panel_ver;
 	char panel_name[DSI_PANEL_MAX_PANEL_LEN];
 
@@ -383,6 +383,8 @@ struct dsi_panel *dsi_panel_ext_bridge_get(struct device *parent,
 
 int dsi_panel_parse_esd_reg_read_configs(struct dsi_panel *panel);
 
+int dsi_panel_parse_panel_cfg(struct dsi_panel *panel, bool is_primary);
+
 void dsi_panel_ext_bridge_put(struct dsi_panel *panel);
 
 void dsi_panel_calc_dsi_transfer_time(struct dsi_host_common_cfg *config,
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 04c5d57fd80c..bdc0f67c603e 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -210,6 +210,7 @@ enum msm_mdp_conn_property {
 
 #define MSM_GPU_MAX_RINGS 4
 #define MAX_H_TILES_PER_DISPLAY 2
+#define MSM_DISP_NAME_LEN_MAX  128
 
 /**
  * enum msm_display_compression_type - compression method used for pixel stream
@@ -521,6 +522,9 @@ struct msm_resource_caps_info {
  * @h_tile_instance:    Controller instance used per tile. Number of elements is
  *                      based on num_of_h_tiles
  * @is_connected:       Set to true if display is connected
+ * @panel_id
+ * @panel_ver
+ * @panel_name[MSM_DISP_NAME_LEN_MAX];
  * @width_mm:           Physical width
  * @height_mm:          Physical height
  * @max_width:          Max width of display. In case of hot pluggable display
@@ -545,6 +549,10 @@ struct msm_display_info {
 
 	bool is_connected;
 
+	uint64_t panel_id;
+	uint64_t panel_ver;
+	char panel_name[MSM_DISP_NAME_LEN_MAX];
+
 	unsigned int width_mm;
 	unsigned int height_mm;
 
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index b98a0a34c7ed..37791d994c15 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1999,8 +1999,37 @@ static int sde_connector_init_debugfs(struct drm_connector *connector)
 }
 #endif
 
+static int sde_connector_get_panel_vendor_info(struct drm_connector *connector)
+{
+	struct sde_connector *sde_connector;
+	struct msm_display_info info;
+
+	if (!connector) {
+		SDE_ERROR("invalid connector\n");
+		return -EINVAL;
+	}
+
+	sde_connector = to_sde_connector(connector);
+	sde_connector_get_info(connector, &info);
+	connector->display_info.panel_id = info.panel_id;
+	connector->display_info.panel_ver = info.panel_ver;
+	strncpy(connector->display_info.panel_name, info.panel_name,
+					sizeof(info.panel_name));
+
+	return 0;
+}
+
+
 static int sde_connector_late_register(struct drm_connector *connector)
 {
+	int ret = 0;
+
+	ret = sde_connector_get_panel_vendor_info(connector);
+	if (ret) {
+		SDE_ERROR("failed to retrieve panel vendor info\n");
+		return ret;
+	}
+
 	return sde_connector_init_debugfs(connector);
 }
 

From 4dc0d44e9c85df804e837a7e25adddd66e51c3e6 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 27 Aug 2019 09:19:45 -0500
Subject: [PATCH 27/94] disp: msm : Add the ACL panel param feature

Add the ACL panel param feature which will be controlled
from the user-space

Port from: 8f42287

Change-Id: I51a2685728810ddd702af287b8b92fa2c63466cb
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444407
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509810
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_defs.h      |  4 ++++
 msm/dsi/dsi_panel.c     | 13 ++++++++++++-
 msm/dsi/dsi_panel.h     |  6 ++++++
 msm/msm_drv.h           |  2 ++
 msm/sde/sde_connector.c | 11 +++++++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 979a60254dbf..0c9f93a4ddb8 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -283,6 +283,8 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_QSYNC_OFF                  Disable qsync mode
  * @DSI_CMD_SET_HBM_ON:                    Turning HBM on
  * @DSI_CMD_SET_HBM_OFF:                   Turning HBM off
+ * @DSI_CMD_SET_ACL_ON:                    Turning ACL on
+ * @DSI_CMD_SET_ACL_OFF:                   Turning ACL off
  * @DSI_CMD_SET_MAX
  */
 enum dsi_cmd_set_type {
@@ -311,6 +313,8 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_QSYNC_OFF,
 	DSI_CMD_SET_HBM_ON,
 	DSI_CMD_SET_HBM_OFF,
+	DSI_CMD_SET_ACL_ON,
+	DSI_CMD_SET_ACL_OFF,
 	DSI_CMD_SET_MAX
 };
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index c633242b4e05..94cf4bc11775 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -101,15 +101,23 @@ static char dsi_dsc_rc_range_max_qp_1_1_scr1[][15] = {
 static char dsi_dsc_rc_range_bpg_offset[] = {2, 0, 0, -2, -4, -6, -8, -8,
 		-8, -10, -10, -12, -12, -12, -12};
 
+
 static struct panel_param_val_map hbm_map[HBM_STATE_NUM] = {
 	{HBM_OFF_STATE, DSI_CMD_SET_HBM_OFF, NULL},
 	{HBM_ON_STATE, DSI_CMD_SET_HBM_ON, NULL},
 };
 
+static struct panel_param_val_map acl_map[ACL_STATE_NUM] = {
+	{ACL_OFF_STATE, DSI_CMD_SET_ACL_OFF, NULL},
+	{ACL_ON_STATE, DSI_CMD_SET_ACL_ON, NULL},
+};
+
 static struct panel_param dsi_panel_param[PANEL_IDX_MAX][PARAM_ID_NUM] = {
 	{
 		{"HBM", hbm_map, HBM_STATE_NUM, HBM_OFF_STATE,
 				HBM_OFF_STATE, false},
+		{"ACL", acl_map, ACL_STATE_NUM, ACL_OFF_STATE,
+			ACL_OFF_STATE, false}
 	},
 };
 
@@ -1999,7 +2007,8 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-qsync-off-commands",
 	"qcom,mdss-dsi-hbm-on-command",
 	"qcom,mdss-dsi-hbm-off-command",
-
+	"qcom,mdss-dsi-acl-on-command",
+	"qcom,mdss-dsi-acl-off-command",
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -2028,6 +2037,8 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-qsync-off-commands-state",
 	"qcom,mdss-dsi-hbm-on-command-state",
 	"qcom,mdss-dsi-hbm-off-command-state",
+	"qcom,mdss-dsi-acl-on-command-state",
+	"qcom,mdss-dsi-acl-off-command-state",
 };
 
 static int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 10758912b490..6e5a87c58c19 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -182,6 +182,12 @@ enum panel_idx {
         PANEL_IDX_MAX,
 };
 
+enum acl_state {
+	ACL_OFF_STATE = 0,
+	ACL_ON_STATE,
+	ACL_STATE_NUM,
+};
+
 enum hbm_state {
 	HBM_OFF_STATE = 0,
 	HBM_ON_STATE,
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index bdc0f67c603e..d3acbfe4536c 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -204,6 +204,7 @@ enum msm_mdp_conn_property {
 
 	/* MOT feature panel*/
 	CONNECTOR_PROP_HBM,
+	CONNECTOR_PROP_ACL,
 	/* total # of properties */
 	CONNECTOR_PROP_COUNT
 };
@@ -322,6 +323,7 @@ enum msm_param_state {
 
 enum msm_param_id {
 	PARAM_HBM_ID = 0,
+	PARAM_ACL_ID,
 	PARAM_ID_NUM
 };
 
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 37791d994c15..cc9958467970 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1499,6 +1499,15 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 		if (rc)
 			goto end;
 		break;
+	case CONNECTOR_PROP_ACL:
+		param_info.value = sde_connector_get_property(
+				connector->state, CONNECTOR_PROP_ACL);
+		param_info.param_idx = PARAM_ACL_ID;
+		param_info.param_conn_idx = CONNECTOR_PROP_ACL;
+		rc = _sde_connector_update_param(c_conn, &param_info);
+		if (rc)
+			goto end;
+		break;
 	default:
 		break;
 	}
@@ -2430,6 +2439,8 @@ static int sde_connector_install_panel_params(struct sde_connector *c_conn)
 
 		if (!strncmp(param_cmds->param_name, "HBM", 3))
 			prop_idx = CONNECTOR_PROP_HBM;
+		else if (!strncmp(param_cmds->param_name, "ACL", 3))
+			prop_idx = CONNECTOR_PROP_ACL;
 		else {
 			SDE_ERROR("Invalid param_name =%s\n",
 						param_cmds->param_name);

From bbaae6dfcce8e477e2375f63ba4b608991ad127a Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 13:28:18 -0500
Subject: [PATCH 28/94] disp: msm: dsi: Add print info for DSI_CTRL

Add the DSI_CTRL index to indicate which DSI_CTRL is enable.

Port from: 559a1c5

Change-Id: Id9a60c5cfcb5c4f7959c10987d85eb17062fa15e
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444408
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509811
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index c00b635f3d70..b932ae11b92b 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -7433,6 +7433,7 @@ int dsi_display_prepare(struct dsi_display *display)
 {
 	int rc = 0;
 	struct dsi_display_mode *mode;
+	struct dsi_display_ctrl *ctrl = &display->ctrl[0];
 
 	if (!display) {
 		DSI_ERR("Invalid params\n");
@@ -7444,7 +7445,9 @@ int dsi_display_prepare(struct dsi_display *display)
 		return -EINVAL;
 	}
 
-	DSI_INFO("%s(%s)+\n", __func__, display->drm_conn->name);
+	DSI_INFO("panel_name=%s ctrl-index=%d\n",
+		display->panel->name, ctrl->ctrl->cell_index);
+
 	SDE_EVT32(SDE_EVTLOG_FUNC_ENTRY);
 	mutex_lock(&display->display_lock);
 

From 157c66528539fea11590699d973dace7d642ab1d Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 27 Aug 2019 09:50:34 -0500
Subject: [PATCH 29/94] disp: msm: dsi: Reducing logging in dsi_panel.c

Reducing unnecessary logging in dsi_panel.c file.

Port from: 772dd12

Change-Id: I32032bf1318874f87d8c71d98d7de8529c7620ff
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444409
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509812
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 94cf4bc11775..d3519cdb9e8a 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -478,7 +478,7 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 {
 	int rc = 0;
 
-	DSI_INFO("%s(%s)+\n", __func__, panel->name);
+	DSI_INFO("(%s)+\n", panel->name);
 	rc = dsi_pwr_enable_regulator(&panel->power_info, true);
 	if (rc) {
 		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
@@ -505,7 +505,7 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 {
 	int rc = 0;
 
-	DSI_INFO("%s(%s)+\n", __func__, panel->name);
+	DSI_INFO("(%s)+\n", panel->name);
 	if (gpio_is_valid(panel->reset_config.disp_en_gpio))
 		gpio_set_value(panel->reset_config.disp_en_gpio, 0);
 
@@ -862,8 +862,8 @@ static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
 	mutex_lock(&panel->panel_lock);
 	if (panel_param->value == param_info->value)
 	{
-		DSI_INFO("%s(mode=%d): requested value=%d is same. Do nothing\n",
-			__func__, param_info->param_idx, param_info->value);
+		DSI_INFO("(mode=%d): requested value=%d is same. Do nothing\n",
+			param_info->param_idx, param_info->value);
 		rc = 0;
 	} else {
 		DSI_DEBUG("%s: requested: old=%d new=%d.\n", __func__,
@@ -890,7 +890,7 @@ static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
 		}
 
 		panel_param->value = param_info->value;
-		DSI_INFO("%s(%d) is setting new value %d\n", __func__,
+		DSI_INFO("(%d) is setting new value %d\n",
 			param_info->param_idx, param_info->value);
 		rc = len;
 	}
@@ -905,7 +905,7 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 {
 	int rc = 0;
 
-	pr_info("%s(%d)\n", __func__, param_info->value);
+	pr_info("(%d)\n", param_info->value);
 	rc = dsi_panel_send_param_cmd(panel, param_info);
 	if (rc < 0)
 		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
@@ -3097,7 +3097,7 @@ static int dsi_panel_parse_topology(
 	}
 
 	if (topology_override >= 0 && topology_override < top_count) {
-		DSI_INFO("override topology: cfg:%d lm:%d comp_enc:%d intf:%d\n",
+		DSI_DEBUG("override topology: cfg:%d lm:%d comp_enc:%d intf:%d\n",
 			topology_override,
 			topology[topology_override].num_lm,
 			topology[topology_override].num_enc,
@@ -3120,7 +3120,7 @@ static int dsi_panel_parse_topology(
 		goto parse_fail;
 	}
 
-	DSI_INFO("default topology: lm: %d comp_enc:%d intf: %d\n",
+	DSI_DEBUG("default topology: lm: %d comp_enc:%d intf: %d\n",
 		topology[top_sel].num_lm,
 		topology[top_sel].num_enc,
 		topology[top_sel].num_intf);
@@ -4822,6 +4822,7 @@ int dsi_panel_post_switch(struct dsi_panel *panel)
 		return -EINVAL;
 	}
 
+	pr_info("(%s)+\n", panel->name);
 	mutex_lock(&panel->panel_lock);
 
 	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_TIMING_SWITCH);
@@ -4844,7 +4845,7 @@ int dsi_panel_enable(struct dsi_panel *panel)
 		return -EINVAL;
 	}
 
-	DSI_INFO("%s(%s)+\n", __func__, panel->name);
+	DSI_INFO("(%s)+\n", panel->name);
 	mutex_lock(&panel->panel_lock);
 
 	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_ON);
@@ -4875,7 +4876,7 @@ int dsi_panel_enable(struct dsi_panel *panel)
 
 			dsi_panel_trigger_panel_dead_event(panel);
 		} else {
-			DSI_INFO("-. Pwr_mode(0x0A) = 0x%x\n", pwr_mode);
+			DSI_INFO("Pwr_mode(0x0A) = 0x%x\n", pwr_mode);
 			panel_recovery_retry = 0;
 		}
 	} else
@@ -4942,7 +4943,7 @@ int dsi_panel_disable(struct dsi_panel *panel)
 		return -EINVAL;
 	}
 
-	DSI_INFO("%s(%s)+\n", __func__, panel->name);
+	DSI_INFO("(%s)+\n", panel->name);
 	mutex_lock(&panel->panel_lock);
 
 	/* Avoid sending panel off commands when ESD recovery is underway */

From cd78236f57023d0eb3068d9f7576a81370b5b7b8 Mon Sep 17 00:00:00 2001
From: shuoyan <shuoyan@motorola.com>
Date: Sun, 11 Nov 2018 11:31:13 -0600
Subject: [PATCH 30/94] disp: msm: Enable "val" to control HBM property

Enable "val" to update HBM property, so user-mode can control
the enable/disable of HBM property through connector property.

Port from: 236c1a8

Change-Id: I2c3c892c515f299067987d8054340b6fd0449af1
Signed-off-by: shuoyan <shuoyan@motorola.com>
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444410
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509813
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/sde/sde_connector.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index cc9958467970..f595405703e2 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1491,8 +1491,7 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 				&c_state->property_state, idx);
 		break;
 	case CONNECTOR_PROP_HBM:
-		param_info.value = sde_connector_get_property(
-				connector->state, CONNECTOR_PROP_HBM);
+		param_info.value = val;
 		param_info.param_idx = PARAM_HBM_ID;
 		param_info.param_conn_idx = CONNECTOR_PROP_HBM;
 		rc = _sde_connector_update_param(c_conn, &param_info);
@@ -1500,8 +1499,7 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 			goto end;
 		break;
 	case CONNECTOR_PROP_ACL:
-		param_info.value = sde_connector_get_property(
-				connector->state, CONNECTOR_PROP_ACL);
+		param_info.value = val;
 		param_info.param_idx = PARAM_ACL_ID;
 		param_info.param_conn_idx = CONNECTOR_PROP_ACL;
 		rc = _sde_connector_update_param(c_conn, &param_info);

From f849421b278344a83fb42a6bb3b319317df287ac Mon Sep 17 00:00:00 2001
From: shuoyan <shuoyan@motorola.com>
Date: Fri, 7 Dec 2018 17:06:32 -0600
Subject: [PATCH 31/94] disp: msm: Support ACL when setting panel param

Support ACL when setting panel param, so user-mode can control
the enable/disable of ACL property.

Port from: e8ab06e

Change-Id: I729226e93cbc91d5f148448bcb834662543d792b
Signed-off-by: shuoyan <shuoyan@motorola.com>
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444411
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509814
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index d3519cdb9e8a..2e03936c8669 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -905,7 +905,20 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 {
 	int rc = 0;
 
-	pr_info("(%d)\n", param_info->value);
+	pr_info("Set HBM to (%d)\n", param_info->value);
+	rc = dsi_panel_send_param_cmd(panel, param_info);
+	if (rc < 0)
+		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
+
+        return rc;
+};
+
+static int dsi_panel_set_acl(struct dsi_panel *panel,
+                        struct msm_param_info *param_info)
+{
+	int rc = 0;
+
+	pr_info("Set ACL to (%d)\n", param_info->value);
 	rc = dsi_panel_send_param_cmd(panel, param_info);
 	if (rc < 0)
 		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
@@ -925,12 +938,17 @@ int dsi_panel_set_param(struct dsi_panel *panel,
 
 	DSI_DEBUG("%s+\n", __func__);
 
-	if (param_info->param_idx == PARAM_HBM_ID)
-		rc = dsi_panel_set_hbm(panel, param_info);
-	else {
-		DSI_ERR("%s: Invalid set_param type=%d\n",
-			__func__, param_info->param_idx);
-		rc = -EINVAL;
+	switch (param_info->param_idx) {
+		case PARAM_HBM_ID :
+			dsi_panel_set_hbm(panel, param_info);
+			break;
+		case PARAM_ACL_ID :
+			dsi_panel_set_acl(panel, param_info);
+			break;
+		default:
+			DSI_ERR("%s: Invalid set_param type=%d\n",
+				__func__, param_info->param_idx);
+			return -EINVAL;
 	}
 
 	return rc;

From b0652e4563d2a6ba935c06be8a1bd69a9955356a Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 12 Mar 2019 08:18:12 -0500
Subject: [PATCH 32/94] disp: msm: Register for reboot_notifier

Since implementing the factory_kill feature, then the msm_drv needs
to register for reboot_notifier to shut down the display accordingly.

Port from: 0d7643c

Change-Id: I08a121c87e042d4ea1fcb0f1d730e0519801a8f9
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444412
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509815
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/msm_drv.c | 33 +++++++++++++++++++++++++++++++++
 msm/msm_drv.h |  3 +++
 2 files changed, 36 insertions(+)

diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index 7025d9d84f1f..4fa5943cae3e 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -41,6 +41,7 @@
 #include <linux/kthread.h>
 #include <uapi/linux/sched/types.h>
 #include <drm/drm_of.h>
+#include <linux/reboot.h>
 
 #include "msm_drv.h"
 #include "msm_kms.h"
@@ -379,6 +380,11 @@ static int msm_drm_uninit(struct device *dev)
 		priv->registered = false;
 	}
 
+	if (priv->msm_drv_notifier.notifier_call) {
+		unregister_reboot_notifier(&priv->msm_drv_notifier);
+		priv->msm_drv_notifier.notifier_call = NULL;
+	}
+
 #ifdef CONFIG_DRM_FBDEV_EMULATION
 	if (fbdev && priv->fbdev)
 		msm_fbdev_free(ddev);
@@ -697,6 +703,23 @@ static struct msm_kms *_msm_drm_init_helper(struct msm_drm_private *priv,
 	return kms;
 }
 
+static void msm_pdev_shutdown(struct platform_device *pdev);
+static int msm_drv_shutdown_notifier_cb(struct notifier_block *nb,
+					unsigned long event, void *unused)
+{
+	struct device *dev;
+	struct platform_device *pdev;
+	struct msm_drm_private *priv = container_of(nb, struct msm_drm_private,
+					msm_drv_notifier);
+
+	dev = priv->dev->dev;
+	pdev = to_platform_device(dev);
+	dev_warn(dev, "prepare to shutdown\n");
+	msm_pdev_shutdown(pdev);
+
+	return NOTIFY_DONE;
+}
+
 static int msm_drm_init(struct device *dev, struct drm_driver *drv)
 {
 	struct platform_device *pdev = to_platform_device(dev);
@@ -827,6 +850,16 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
 
 	drm_kms_helper_poll_init(ddev);
 
+	priv->msm_drv_notifier.notifier_call = msm_drv_shutdown_notifier_cb;
+	priv->msm_drv_notifier.next = NULL;
+	priv->msm_drv_notifier.priority = 1;
+	ret = register_reboot_notifier(&priv->msm_drv_notifier);
+	if (ret) {
+		dev_err(dev, "Failed to register for reboot_notifier. ret = %d\n",
+					ret);
+		goto fail;
+	}
+
 	return 0;
 
 fail:
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index d3acbfe4536c..cc0fc3754081 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -36,6 +36,7 @@
 #include <linux/sde_io_util.h>
 #include <asm/sizes.h>
 #include <linux/kthread.h>
+#include <linux/notifier.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_atomic.h>
@@ -731,6 +732,8 @@ struct msm_drm_private {
 
 	/* update the flag when msm driver receives shutdown notification */
 	bool shutdown_in_progress;
+
+	struct notifier_block msm_drv_notifier;
 };
 
 /* get struct msm_kms * from drm_device * */

From df88a527871bb6a536e6b59a3b67e78d805766b9 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 29 Aug 2019 13:28:54 -0500
Subject: [PATCH 33/94] disp: msm: fix checking returned value of
 xx_cmd_transfer

Change the checking returned value of dsi_ctrl_cmd_transfer(), because
if this is a read command then it will return the number byte of
reading when reading succeed. If this is a write command, then it
will return "none-zero" for failure.

Port from: 01f1152

Change-Id: I961102933e4aad3d2ec99ffaa8cf6d81adac501f
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1444415
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509816
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index b932ae11b92b..c218b0b2c1b2 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -3219,10 +3219,11 @@ static ssize_t dsi_host_transfer(struct mipi_dsi_host *host,
 			cmd_flags |= DSI_CTRL_CMD_ASYNC_WAIT;
 
 		if (msg->rx_buf)
-			flags |= DSI_CTRL_CMD_READ;
+			cmd_flags |= DSI_CTRL_CMD_READ;
 		rc = dsi_ctrl_cmd_transfer(display->ctrl[ctrl_idx].ctrl, msg,
 				&cmd_flags);
-		if (rc) {
+		if (((cmd_flags & DSI_CTRL_CMD_READ) && rc <= 0) ||
+				(!(cmd_flags & DSI_CTRL_CMD_READ) && rc)) {
 			DSI_ERR("[%s] cmd transfer failed, rc=%d\n",
 			       display->name, rc);
 			goto error_disable_cmd_engine;

From 08cb2e7e51cbd1e94583e2c8044c3588900b2664 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Mon, 28 Oct 2019 08:58:24 -0500
Subject: [PATCH 34/94] disp: msm: implement xxx-hbm-is-51cmd dts entry

Add qcom,mdss-dsi-panel-hbm-is-51cmd to panel's dts to indicate
that the HBM command is using the same backlight command 0x51 command.
Therefore when the HBM is on, then the backlight level will be saved
and backlight command will be ignored. When the HBM is off then stored
backlight level will be set

Port from 9bafa67

Change-Id: I856b0b27c282eae504b924753c267084488d71ab
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1445363
Tested-by: Jira Key
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509817
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 37 +++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  4 ++++
 2 files changed, 41 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 2e03936c8669..d4aa67debb9c 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -690,6 +690,13 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	else
 		rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);
 
+	if (panel->is_hbm_using_51_cmd && panel->is_hbm_on) {
+		panel->bl_lvl_during_hbm = bl_lvl;
+		DSI_DEBUG("HBM is on.. ignore setting backlight. bl_vl=%d\n",
+						panel->bl_lvl_during_hbm);
+		return 0;
+	}
+
 	if (bl->bl_2bytes_enable)
 		rc = mipi_dsi_dcs_set_display_brightness_2bytes(dsi, bl_lvl);
 	else
@@ -904,11 +911,36 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
                         struct msm_param_info *param_info)
 {
 	int rc = 0;
+	u32 tmp_bklt_lvl = 0;
+	bool old_hbm_on;
 
 	pr_info("Set HBM to (%d)\n", param_info->value);
 	rc = dsi_panel_send_param_cmd(panel, param_info);
 	if (rc < 0)
 		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
+	else {
+		mutex_lock(&panel->panel_lock);
+		if (!panel->is_hbm_using_51_cmd) {
+			mutex_unlock(&panel->panel_lock);
+			return rc;
+		}
+
+		old_hbm_on = panel->is_hbm_on ;
+		panel->is_hbm_on = param_info->value;
+		if (!panel->is_hbm_on) {
+			tmp_bklt_lvl= panel->bl_lvl_during_hbm;
+			panel->bl_lvl_during_hbm = 0;
+		}
+		mutex_unlock(&panel->panel_lock);
+
+		if (param_info->value == 0 && old_hbm_on && tmp_bklt_lvl) {
+			rc = dsi_panel_set_backlight(panel, tmp_bklt_lvl);
+			if (rc)
+				DSI_ERR("unable to set backlight\n");
+			else
+				tmp_bklt_lvl = 0;
+		}
+	}
 
         return rc;
 };
@@ -3624,6 +3656,11 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 		}
 	}
 
+	panel->is_hbm_using_51_cmd = of_property_read_bool(of_node,
+				"qcom,mdss-dsi-panel-hbm-is-51cmd");
+	if (panel->is_hbm_using_51_cmd)
+		DSI_INFO("HBM command is using 0x51 command\n");
+
 	return rc;
 
 parse_err:
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 6e5a87c58c19..af7ee9b6e60d 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -271,6 +271,10 @@ struct dsi_panel {
 	u32 disp_on_chk_val;
 	bool no_panel_on_read_support;
 
+	bool is_hbm_using_51_cmd;
+	bool is_hbm_on;
+	u32  bl_lvl_during_hbm;
+
 	struct panel_param *param_cmds;
 };
 

From 525a1ae97a6af69d5d50404463439b89b32e1447 Mon Sep 17 00:00:00 2001
From: zhanggb <zhanggb@motorola.com>
Date: Thu, 21 Nov 2019 15:43:24 +0800
Subject: [PATCH 35/94] Kernel: Add Moto extern display code

[1]Add dsi early power feature
Add a interface to power on display panel before powermanager resume to
accelerate the display resume speed in some circumstance such as fringer
print wakeup.

[2]Debug tool - parse lcd para from debug file
Add a parse function to get lcd bringup parameters from file in
/vendor/firmware/. This help vendor engineer to debug lcd issue without
requiring moto engineer to bulid new dtbo or boot image.

1.Please push lcd para file lcd-paras.txt to /vendor/firmware/
2.Below command can update lcd paras:
  adb shell "echo 0 > /sys/devices/platform/soc/soc:qcom,dsi-display/
  dsi_display_parse_para"
3.Below command can check new command from kernel log:
  adb shell cat /sys/devices/platform/soc/soc:qcom,dsi-display/
  dsi_display_parse_para

Change-Id: Icdadde6f0405eea05f597a370d9f29dceb59ccb3
Reviewed-on: https://gerrit.mot.com/1459091
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509818
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/Makefile                  |    1 +
 msm/dsi/dsi_display.c         |   70 +-
 msm/dsi/dsi_display.h         |    6 +
 msm/dsi/dsi_display_mot_ext.c | 1223 +++++++++++++++++++++++++++++++++
 msm/dsi/dsi_display_mot_ext.h |   66 ++
 5 files changed, 1365 insertions(+), 1 deletion(-)
 create mode 100644 msm/dsi/dsi_display_mot_ext.c
 create mode 100644 msm/dsi/dsi_display_mot_ext.h

diff --git a/msm/Makefile b/msm/Makefile
index b5ab9c01275d..edf9d09a5b40 100644
--- a/msm/Makefile
+++ b/msm/Makefile
@@ -101,6 +101,7 @@ msm_drm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi_phy.o \
 	dsi/dsi_panel.o \
 	dsi/dsi_clk_manager.o \
 	dsi/dsi_display_test.o \
+	dsi/dsi_display_mot_ext.o \
 
 msm_drm-$(CONFIG_DSI_PARSER) += dsi/dsi_parser.o \
 
diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index c218b0b2c1b2..6b9327069e38 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -4043,6 +4043,11 @@ static int dsi_display_parse_dt(struct dsi_display *display)
 			break;
 	}
 
+	/* Parse mot extend feature supporting */
+	display->is_dsi_mot_ext_enabled = of_property_read_bool(of_node,
+				"qcom,platform-mot-ext-feature-enable");
+	pr_info("is_dsi_mot_ext_enabled\n", display->is_dsi_mot_ext_enabled);
+
 	DSI_DEBUG("success\n");
 error:
 	return rc;
@@ -5727,6 +5732,12 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 			goto end;
 	}
 
+	// Initialize mot extend code for early powern and debug tool feature
+	if ( display->is_dsi_mot_ext_enabled && index == DSI_PRIMARY ) {
+		dsi_display_ext_init(display);
+	}
+	pr_info("dsi_display_dev_probe: display(%p), name: %s, is_dsi_mot_ext_enabled=%d\n", display, (display->name==NULL)?"Null":display->name, display->is_dsi_mot_ext_enabled);
+
 	return 0;
 end:
 	if (display)
@@ -6339,8 +6350,12 @@ int dsi_display_get_info(struct drm_connector *connector,
 
 	info->is_connected = true;
 
-	if (!strcmp(display->display_type, "primary"))
+	if (!strcmp(display->display_type, "primary")) {
 		info->display_type = SDE_CONNECTOR_PRIMARY;
+		//Update panel info for Mot early power
+		if ( display->is_dsi_mot_ext_enabled )
+			display->is_dsi_mot_primary = true;
+	}
 	else if (!strcmp(display->display_type, "secondary"))
 		info->display_type = SDE_CONNECTOR_SECONDARY;
 
@@ -7073,6 +7088,14 @@ int dsi_display_set_mode(struct dsi_display *display,
 			timing.refresh_rate);
 
 	memcpy(display->panel->cur_mode, &adj_mode, sizeof(adj_mode));
+
+	//Update early power state
+	//This interface is called from dsi bridge, not moto early-power.
+	//It means it is system who want powr on display
+	//From now on early power on is forbidden
+	if ( display->is_dsi_mot_ext_enabled )
+		display->dsi_mot_ext.early_power_state = DSI_EARLY_POWER_FORBIDDEN;
+
 error:
 	mutex_unlock(&display->display_lock);
 	return rc;
@@ -7452,6 +7475,12 @@ int dsi_display_prepare(struct dsi_display *display)
 	SDE_EVT32(SDE_EVTLOG_FUNC_ENTRY);
 	mutex_lock(&display->display_lock);
 
+	//Check if Mot early power is on going...
+	if ( display->is_dsi_mot_ext_enabled && display->is_dsi_display_prepared ) {
+		pr_info("already prepared\n");
+		goto error;
+	}
+
 	mode = display->panel->cur_mode;
 
 	dsi_display_set_ctrl_esd_check_flag(display, false);
@@ -7576,6 +7605,11 @@ int dsi_display_prepare(struct dsi_display *display)
 			}
 		}
 	}
+
+	//Update prepare statue for Mot early power
+	if ( display->is_dsi_mot_ext_enabled )
+		display->is_dsi_display_prepared = true;
+
 	goto error;
 
 error_ctrl_link_off:
@@ -7987,6 +8021,12 @@ int dsi_display_enable(struct dsi_display *display)
 
 	mutex_lock(&display->display_lock);
 
+	//Check if Mot early power is on going
+	if ( display->is_dsi_mot_ext_enabled && dsi_panel_initialized(display->panel)) {
+		pr_info("panel already enabled\n");
+		goto error;
+	}
+
 	mode = display->panel->cur_mode;
 
 	if (mode->dsi_mode_flags & DSI_MODE_FLAG_DMS) {
@@ -8141,6 +8181,15 @@ int dsi_display_pre_disable(struct dsi_display *display)
 			DSI_ERR("[%s] panel pre-disable failed, rc=%d\n",
 				display->name, rc);
 	}
+
+
+        //Update early power state
+        //Here is called from dsi bridge, not moto early-power.
+        //It means it is system who want powr off display
+        //From now on early power on is permitted
+        if ( display->is_dsi_mot_ext_enabled )
+                display->dsi_mot_ext.early_power_state = DSI_EARLY_POWER_IDLE;
+
 	goto exit;
 
 error_disable_clks:
@@ -8168,6 +8217,14 @@ int dsi_display_disable(struct dsi_display *display)
 	SDE_EVT32(SDE_EVTLOG_FUNC_ENTRY);
 	mutex_lock(&display->display_lock);
 
+	//Check is Mot early power is on going
+	pr_info("display %p, name %s is_dsi_mot_primary(%d)\n", display, display->name, display->is_dsi_mot_primary);
+	if ( display->is_dsi_mot_ext_enabled && !display->is_dsi_display_prepared) {
+		mutex_unlock(&display->display_lock);
+		pr_info("panel already unprepared\n");
+		return rc;
+	}
+
 	rc = dsi_display_wake_up(display);
 	if (rc)
 		DSI_ERR("[%s] display wake up failed, rc=%d\n",
@@ -8231,6 +8288,13 @@ int dsi_display_unprepare(struct dsi_display *display)
 	SDE_EVT32(SDE_EVTLOG_FUNC_ENTRY);
 	mutex_lock(&display->display_lock);
 
+	//Check if Mot early power is on going
+	if ( display->is_dsi_mot_ext_enabled && !dsi_panel_initialized(display->panel)) {
+		mutex_unlock(&display->display_lock);
+		pr_info("panel already disabled\n");
+		return rc;
+	}
+
 	rc = dsi_display_wake_up(display);
 	if (rc)
 		DSI_ERR("[%s] display wake up failed, rc=%d\n",
@@ -8298,6 +8362,10 @@ int dsi_display_unprepare(struct dsi_display *display)
 			       display->name, rc);
 	}
 
+	//Update prepare state for Mot early power
+	if ( display->is_dsi_mot_ext_enabled )
+		display->is_dsi_display_prepared = false;
+
 	mutex_unlock(&display->display_lock);
 
 	/* Free up DSI ERROR event callback */
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index 9537ab435f10..2db7e0d03387 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -21,6 +21,7 @@
 #include "dsi_panel.h"
 #include "sde_connector.h"
 #include "sde_motUtil.h"
+#include "dsi_display_mot_ext.h"
 
 #define MAX_DSI_CTRLS_PER_DISPLAY             2
 #define DSI_CLIENT_NAME_SIZE		20
@@ -265,6 +266,11 @@ struct dsi_display {
 	struct work_struct fifo_underflow_work;
 	struct work_struct fifo_overflow_work;
 	struct work_struct lp_rx_timeout_work;
+	/* used for moto feature early-pane- power to speed up the power on sequence */
+	bool is_dsi_mot_ext_enabled;
+	bool is_dsi_display_prepared;
+	bool is_dsi_mot_primary;
+	struct dsi_mot_ext_feature dsi_mot_ext;
 
 	/* firmware panel data */
 	const struct firmware *fw;
diff --git a/msm/dsi/dsi_display_mot_ext.c b/msm/dsi/dsi_display_mot_ext.c
new file mode 100644
index 000000000000..2d1c2a448baf
--- /dev/null
+++ b/msm/dsi/dsi_display_mot_ext.c
@@ -0,0 +1,1223 @@
+/*
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#define pr_fmt(fmt)	"msm-dsi-display:[%s] " fmt, __func__
+
+#include <linux/list.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/err.h>
+#include <linux/random.h>
+
+#include <linux/string.h>
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/seq_file.h>
+#include <linux/firmware.h>
+
+#include "msm_drv.h"
+#include "sde_connector.h"
+#include "msm_mmu.h"
+#include "dsi_display.h"
+#include "dsi_panel.h"
+#include "dsi_ctrl.h"
+#include "dsi_ctrl_hw.h"
+#include "dsi_drm.h"
+#include "dsi_clk.h"
+#include "dsi_pwr.h"
+#include "sde_dbg.h"
+#include "dsi_parser.h"
+#include "dsi_display_mot_ext.h"
+
+static struct dsi_mot_ext_feature *g_dsi_mot_ext = NULL;
+static int g_early_power_count = 0;
+//Timer for pressure test and debug
+static static struct alarm *g_wakeup_timer = NULL;
+static int g_wakeup_timer_interval = 0;
+static int g_early_power_test_en = 0;
+
+extern const char *cmd_set_prop_map[DSI_CMD_SET_MAX];
+
+static void dsi_display_early_power_on_work(struct work_struct *work)
+{
+	struct dsi_display *display = NULL;
+	struct dsi_mot_ext_feature *mot_ext = NULL;
+	int rc = 0;
+
+	pr_info("+++++ early_power_state: %d\n", (g_dsi_mot_ext!=NULL)?g_dsi_mot_ext->early_power_state:-1);
+	mot_ext = container_of(work, struct dsi_mot_ext_feature, early_on_work);
+	if (!mot_ext) {
+		pr_warning("failed to get mot_ext\n");
+		return;
+	}
+	__pm_wakeup_event(&mot_ext->early_wake_src, 900);
+	display = mot_ext->display;
+	if (!display || !display->panel || !display->is_dsi_mot_primary ||
+	    (display->panel->panel_mode != DSI_OP_VIDEO_MODE) ||
+	    atomic_read(&display->panel->esd_recovery_pending)) {
+		pr_warning("----- Invalid recovery use case, early_power_state: %d\n", mot_ext->early_power_state);
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+
+	mutex_lock(&display->display_lock);
+	if (mot_ext->early_power_state == DSI_EARLY_POWER_FORBIDDEN || display->is_dsi_display_prepared) {
+		pr_warning("----- already prepared or set_mode called, early_power_state: %d, is_dsi_display_prepared %d\n",
+			mot_ext->early_power_state, display->is_dsi_display_prepared);
+		mutex_unlock(&display->display_lock);
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+	mot_ext->early_power_state = DSI_EARLY_POWER_BEGIN;
+	mutex_unlock(&display->display_lock);
+
+	rc = dsi_display_prepare(display);
+	if (rc) {
+		pr_err("----- DSI display prepare failed, rc=%d. early_power_state %d\n", rc, mot_ext->early_power_state);
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+
+	mutex_lock(&display->display_lock);
+	if (mot_ext->early_power_state == DSI_EARLY_POWER_FORBIDDEN || display->panel->panel_initialized) {
+		mutex_unlock(&display->display_lock);
+		pr_warning("----- already enabled or set_mode called, early_power_state: %d, panel_initialized %d\n",
+			mot_ext->early_power_state, display->panel->panel_initialized);
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+	mot_ext->early_power_state = DSI_EARLY_POWER_PREPARED;
+	mutex_unlock(&display->display_lock);
+
+	rc = dsi_display_enable(display);
+	if (rc) {
+		pr_err("DSI display enable failed, rc=%d. early_power_state %d\n", rc, mot_ext->early_power_state);
+		(void)dsi_display_unprepare(display);
+		return;
+	}
+
+	mutex_lock(&display->display_lock);
+	if (mot_ext->early_power_state != DSI_EARLY_POWER_FORBIDDEN) {
+		mot_ext->early_power_state = DSI_EARLY_POWER_INITIALIZED;
+		queue_delayed_work(mot_ext->early_power_workq, &mot_ext->early_off_work, HZ/2);
+	}
+	mutex_unlock(&display->display_lock);
+
+	//Do not relax wake_lock here to avoid AP enter deep suspend before early_off called, which may cause kernel panic.
+	//__pm_relax(&mot_ext->early_wake_src);
+
+	pr_info("----- early_power_state: %d, g_early_power_count %d\n", mot_ext->early_power_state, g_early_power_count++);
+}
+
+static void dsi_display_early_power_off_work(struct work_struct *work)
+{
+	struct dsi_display *display = NULL;
+	struct dsi_mot_ext_feature *mot_ext = NULL;
+	int rc = 0;
+	struct delayed_work *dw = to_delayed_work(work);
+
+	pr_info("+++++ early_power_state: %d\n", (g_dsi_mot_ext!=NULL)?g_dsi_mot_ext->early_power_state:-1);
+	mot_ext = container_of(dw, struct dsi_mot_ext_feature, early_off_work);
+	if (!mot_ext) {
+		pr_warning("failed to get mot_ext\n");
+		return;
+	}
+	__pm_wakeup_event(&mot_ext->early_wake_src, 500);
+	display = mot_ext->display;
+	if (!display || !display->panel ||
+	    (display->panel->panel_mode != DSI_OP_VIDEO_MODE) ||
+	    atomic_read(&display->panel->esd_recovery_pending)) {
+		pr_warning("Invalid recovery use case, early_power_state: %d\n", mot_ext->early_power_state);
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+	if (mot_ext->early_power_state != DSI_EARLY_POWER_INITIALIZED) {
+		pr_info("%s ----- no need, return.  early_power_state %d\n", __func__, mot_ext->early_power_state);
+		//mot_ext->early_power_state = DSI_EARLY_POWER_IDLE;
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+
+	rc = dsi_display_disable(display);
+	if (rc) {
+		pr_err("DSI display disable failed, rc=%d. early_power_state %d\n", rc, mot_ext->early_power_state);
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+
+	mutex_lock(&display->display_lock);
+	if (mot_ext->early_power_state == DSI_EARLY_POWER_FORBIDDEN) {
+		pr_warning("----- set_mode called, early_power_state: %d, is_dsi_display_prepared %d\n",
+			mot_ext->early_power_state, display->is_dsi_display_prepared);
+		mutex_unlock(&display->display_lock);
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+	mutex_unlock(&display->display_lock);
+
+	rc = dsi_display_unprepare(display);
+	if (rc) {
+		pr_err("DSI display unprepare failed, rc=%d. early_power_state %d\n", rc, mot_ext->early_power_state);
+		__pm_relax(&mot_ext->early_wake_src);
+		return;
+	}
+
+	mutex_lock(&display->display_lock);
+	if (mot_ext->early_power_state != DSI_EARLY_POWER_FORBIDDEN) {
+		g_dsi_mot_ext->early_power_state = DSI_EARLY_POWER_IDLE;
+	}
+	mutex_unlock(&display->display_lock);
+
+	__pm_relax(&mot_ext->early_wake_src);
+
+	pr_info("----- early_power_state: %d\n", mot_ext->early_power_state);
+}
+
+void ext_dsi_display_early_power_on(void)
+{
+	// If previous work has not finished, skip
+	if (g_dsi_mot_ext == NULL || g_dsi_mot_ext->early_power_state == DSI_EARLY_POWER_FORBIDDEN) {
+		//pr_info("==== g_dsi_mot_ext %p, early_power_state: %d\n",
+		//	g_dsi_mot_ext, g_dsi_mot_ext->early_power_state);
+		return;
+	}
+        if (g_dsi_mot_ext->early_power_state != DSI_EARLY_POWER_IDLE) {
+		//pr_info("==== early_power_state: %d is not IDLE\n",
+		//	g_dsi_mot_ext->early_power_state);
+		return;
+        }
+
+	//pr_info("#### display(%p), early_power_state: %d\n", g_dsi_mot_ext->display, g_dsi_mot_ext->early_power_state);
+	queue_work(g_dsi_mot_ext->early_power_workq, &g_dsi_mot_ext->early_on_work);
+}
+EXPORT_SYMBOL(ext_dsi_display_early_power_on);
+
+static enum alarmtimer_restart dsi_display_wakeup_timer_func(struct alarm *alarm, ktime_t now)
+{
+	ktime_t start, add;
+	int randomTime = 0;
+	pr_info("g_wakeup_timer_interval %d, g_early_power_test_en %d\n", g_wakeup_timer_interval, g_early_power_test_en);
+	if (g_early_power_test_en)
+		ext_dsi_display_early_power_on();
+
+	if (g_wakeup_timer_interval != 0) {
+		//srand(time(NULL));
+		start = ktime_get_boottime();
+		randomTime = prandom_u32_max(g_wakeup_timer_interval) + g_wakeup_timer_interval;
+		add = ktime_set(randomTime, 0);
+		alarm_start(g_wakeup_timer, ktime_add(start, add));
+		pr_info("%s: randomTimer %d seconds set\n", __func__, randomTime);
+	}
+
+	return ALARMTIMER_NORESTART;
+}
+
+static int my_atoi(const char *src)
+{
+      int s = 0;
+      bool isMinus = false;
+
+      while(*src == ' ')
+      {
+          src++;
+      }
+
+      if(*src == '+' || *src == '-')
+      {
+          if(*src == '-')
+          {
+              isMinus = true;
+          }
+          src++;
+      }
+      else if(*src < '0' || *src > '9')
+      {
+          s = 2147483647;
+          return s;
+      }
+
+      while(*src != '\0' && *src >= '0' && *src <= '9')
+      {
+          s = s * 10 + *src - '0';
+          src++;
+      }
+      return s * (isMinus ? -1 : 1);
+}
+
+static u32 atoh(const unsigned char *in)
+{
+	u32 sum = 0;
+	unsigned int mult = 1;
+	unsigned char c;
+	unsigned int len = strlen(in);
+
+	while (len) {
+		int value;
+
+		c = in[len - 1];
+		value = hex_to_bin(c);
+		if (value >= 0)
+			sum += mult * value;
+		mult *= 16;
+		--len;
+	}
+	return sum;
+}
+
+static char *strtok(char *s, const char * sep)
+{
+	static char *p;
+	if (!s && !(s = p)) return NULL;
+	s += strspn(s, sep);
+	if (!*s) return p = 0;
+	p = s + strcspn(s, sep);
+	if (*p) *p++ = 0;
+	else p = 0;
+	return s;
+}
+
+static bool isNumStr(char *s)
+{
+	int i;
+	int len;
+	char* pbuf = s;
+
+	len = strlen(pbuf);
+	while(i < len) {
+		if(!((pbuf[i]>= '0' && pbuf[i] <= '9' ) || (pbuf[i] >= 'a' && pbuf[i] <= 'f' ) || (pbuf[i] >= 'A' && pbuf[i] <= 'F' )))
+			return false;
+		i++;
+	}
+	return true;
+}
+
+static char* dsi_panel_line_remove_front_space(char* pinstr)
+{
+	char* pbuf = NULL;
+	int i = 0;
+	int len = strlen(pinstr);
+	pbuf = pinstr;
+	while(i < len) {
+		if( pbuf[i]  !=  0x20 && pbuf[i]  !=  0x09 )  //skip space and horizontal tab
+			break;
+		i++;
+	}
+	//pr_info("strlen %d\n", len);
+	return pbuf + i;
+}
+
+static int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
+{
+	const u32 cmd_set_min_size = 7;
+	u32 count = 0;
+	u32 packet_length;
+	u32 tmp;
+	char* pbuf = NULL;
+	char tembuf[8];
+	int i;
+
+	pbuf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+	while (length >= cmd_set_min_size) {
+		packet_length = cmd_set_min_size;
+		tmp = ((data[5] << 8) | (data[6]));
+		packet_length += tmp;
+		if (packet_length > length) {
+			pr_err("format error\n");
+			return -EINVAL;
+		}
+#if 1 //print data
+		if (pbuf) {
+			snprintf(pbuf, PAGE_SIZE, "packet_data:   %2x  %2x  %2x  %2x  %2x   %2x  %2x  ",
+				data[0], data[1], data[2], data[3], data[4], data[5], data[6]);
+		}
+		for (i=0; i<tmp; i++) {
+			memset(tembuf, 0, 8);
+			snprintf(tembuf, 8, " %2x ", data[cmd_set_min_size+i]);
+			strcat(pbuf, tembuf);
+		}
+		strcat(pbuf, "\n");
+		printk("%s", pbuf);
+#endif
+		length -= packet_length;
+		data += packet_length;
+		count++;
+	};
+
+	*cnt = count;
+	if (pbuf)
+		kfree(pbuf);
+	return 0;
+}
+
+static void dsi_panel_destroy_cmd_packets(struct dsi_panel_cmd_set *set)
+{
+	u32 i = 0;
+	struct dsi_cmd_desc *cmd;
+
+	for (i = 0; i < set->count; i++) {
+		cmd = &set->cmds[i];
+		kfree(cmd->msg.tx_buf);
+	}
+}
+
+static void dsi_panel_dealloc_cmd_packets(struct dsi_panel_cmd_set *set)
+{
+	kfree(set->cmds);
+}
+
+static int dsi_panel_create_cmd_packets(const char *data,
+					u32 length,
+					u32 count,
+					struct dsi_cmd_desc *cmd)
+{
+	int rc = 0;
+	int i, j;
+	u8 *payload;
+
+	for (i = 0; i < count; i++) {
+		u32 size;
+
+		cmd[i].msg.type = data[0];
+		cmd[i].last_command = (data[1] == 1 ? true : false);
+		cmd[i].msg.channel = data[2];
+		cmd[i].msg.flags |= (data[3] == 1 ? MIPI_DSI_MSG_REQ_ACK : 0);
+		cmd[i].msg.ctrl = 0;
+		cmd[i].post_wait_ms = cmd[i].msg.wait_ms = data[4];
+		cmd[i].msg.tx_len = ((data[5] << 8) | (data[6]));
+
+		size = cmd[i].msg.tx_len * sizeof(u8);
+
+		payload = kzalloc(size, GFP_KERNEL);
+		if (!payload) {
+			rc = -ENOMEM;
+			goto error_free_payloads;
+		}
+
+		for (j = 0; j < cmd[i].msg.tx_len; j++)
+			payload[j] = data[7 + j];
+
+		cmd[i].msg.tx_buf = payload;
+		data += (7 + cmd[i].msg.tx_len);
+	}
+
+	return rc;
+error_free_payloads:
+	for (i = i - 1; i >= 0; i--) {
+		cmd--;
+		kfree(cmd->msg.tx_buf);
+	}
+
+	return rc;
+}
+
+static int dsi_panel_alloc_cmd_packets(struct dsi_panel_cmd_set *cmd,
+					u32 packet_count)
+{
+	u32 size;
+
+	size = packet_count * sizeof(*cmd->cmds);
+	cmd->cmds = kzalloc(size, GFP_KERNEL);
+	if (!cmd->cmds)
+		return -ENOMEM;
+
+	cmd->count = packet_count;
+	return 0;
+}
+
+static bool dsi_panel_mot_parse_commands(char* str, u32* length, struct dsi_display_mode_priv_info *priv_info, enum dsi_cmd_set_type type, char* pcur)
+{
+	char * pos = NULL;
+	char * posStart = NULL;
+	char * posEnd = NULL;
+	char *buf = NULL;  //dont change this point after alloc, else kfree will error and kernel panic
+	char *pbuf = NULL;
+	char *pLine = NULL;
+	char *pLineEnd = NULL;
+	char *token = NULL;
+	char numstr[8];
+	uint len = 0;
+	uint cmdlen = 0;
+	u8* data = NULL;
+	uint index = 0;
+	char delim[] = " \t";  //space and horizontal tab
+
+	//pr_info("input str : %s\n", str);
+	*length = 0;
+	pos = strstr(str, "=");
+	if (pos) {
+		posStart = strstr(pos, "[");
+		if (posStart) {
+			posStart ++;
+			posEnd = strstr(posStart, "]");
+			if (posEnd) {
+				pos = strstr(posEnd, "\n");
+				if (pos)
+					posEnd = pos;
+				*length = posEnd - pcur + 1;
+			}
+			if (posEnd) {
+				pr_info("posStart address(%llx), val: posStart[0][1][2]=[%2x][%2x][%2x],   posEnd address(%llx), val: posEnd[0][1][2]=[%2x][%2x][%2x]\n",
+					posStart, posStart[0], posStart[1], posStart[2], posEnd, posEnd[0], posEnd[1], posEnd[2]);
+				len = posEnd - posStart - 1;
+				//*length = len - 1;
+				buf = kmalloc(len+5, GFP_KERNEL);	//data in this buffer can be modified, if there is "\n", we also copy it to buf
+				if (!buf) {
+					pr_warn("kmalloc failed for command buf\n");
+					goto error_exit;
+				}
+				pbuf = buf;
+				memset(pbuf, 0, len+5);
+				//strncpy(pbuf, posStart, len);
+				memcpy(pbuf, posStart, len);
+				//copy_from_user(pbuf, posStart, len);
+				//pbuf[len] = '\0';
+				data = (u8*)pbuf;
+				posEnd = pbuf + len;
+				memset(numstr, 0, 8);
+				pr_info("bufStart address(%llx), val: bufStart[0][1][2]=[%2x][%2x][%2x],   bufEnd address(%llx), val: bufEnd[0][1][2]=[%2x][%2x][%2x]\n",
+					pbuf, pbuf[0], pbuf[1], pbuf[2], posEnd, posEnd[0], posEnd[1], posEnd[2]);
+				pr_info("command str : len %d\n", len);
+				pLine = pbuf;
+				pLineEnd = posEnd;
+				token = pLine;
+
+				while (pbuf < posEnd) {
+
+					pLineEnd = strstr(pLine, "\n");
+					if (pLineEnd) {
+						pLineEnd--;  //If this is a '\n' only line, ptr need --
+					} else
+						pLineEnd = posEnd;
+
+					pLineEnd[0] = '\0'; //add terminal flag and remove '\n' in the str
+					pLineEnd[1] = '\0';
+					token = strstr(pLine, "]");
+					if (!token) {
+						token = strstr(pLine, "//");
+						if (!token)
+							token = strstr(pLine, "/*");
+					}
+					if (token) {
+						pr_info("there is comment '/*' in pLine address: %llx, token[0]=%c, pLine str: %s\n", pLine, token[0], pLine);
+						token[0] = '\0';
+					} else {
+						token = pLineEnd;
+					}
+					//pr_info("#pre pLine address: %llx, pLine[0]=%x, pLine str: %s\n", pLine, pLine[0], pLine);
+					pLine = dsi_panel_line_remove_front_space(pLine);
+					pr_info("=pst pLine address: %llx, pLine[0]=%x, pLine str: %s\n", pLine, pLine[0], pLine);
+					//pr_info("token address:     %llx,      token[0][1][2]=[%2x][%2x][%2x]\n", token, token[0], token[1], token[2]);
+					//pr_info("pLineEnd address: %llx, pLineEnd[0][1][2]=[%2x][%2x][%2x]\n", pLineEnd, pLineEnd[0], pLineEnd[1], pLineEnd[2]);
+					pLineEnd += 2;
+					if (pLine != token) {
+						for(token = strtok(pLine, delim); token != NULL; token = strtok(NULL, delim)) {
+							if (isNumStr(token)) {
+								data[index++] = atoh(token);
+								//pr_info("find num str: %s -> %2x\n", token, data[index-1]);
+							}
+						}
+					} else
+						pr_info("nothing line: %llx, pLine str: %s\n", pLine, pLine);
+
+					pbuf = pLineEnd ;
+					pLine = pLineEnd;
+
+				}
+
+				dsi_panel_get_cmd_pkt_count(data, index, &cmdlen);
+				pr_info("got command packet num : %d\n", cmdlen);
+				if (type < DSI_CMD_SET_MAX) {
+					dsi_panel_destroy_cmd_packets(&priv_info->cmd_sets[type]);
+					dsi_panel_dealloc_cmd_packets(&priv_info->cmd_sets[type]);
+					dsi_panel_alloc_cmd_packets(&priv_info->cmd_sets[type], cmdlen);
+					dsi_panel_create_cmd_packets(data, 0, cmdlen, priv_info->cmd_sets[type].cmds);
+				}
+
+			} else {
+				pr_err(" ] not found in this line!\n");
+				goto error_exit;
+			}
+		} else {
+			pr_err(" [ not found in this line\n");
+			goto error_exit;
+		}
+	} else {
+		pr_err(" = not found in this line!\n");
+		goto error_exit;
+	}
+
+error_exit:
+	if (buf)
+		kfree(buf);
+	//pr_info("need skip length : %d\n", *length);
+	return true;
+}
+
+static bool dsi_panel_mot_parse_u32(char* str, u32* val)
+{
+	char * pos = NULL;
+	char * posStart = NULL;
+	char * posEnd = NULL;
+	char buf[64];
+	uint len = 0;
+	posStart = strstr(str, "=");
+	if (posStart) {
+		posStart = strstr(posStart, "<");
+		if (posStart) {
+			posStart ++;
+			posEnd = strstr(posStart, ">");
+			if (posEnd) {
+				pos = strstr(posStart, " ");
+				while(pos != NULL) {
+					if (pos == posStart)
+						posStart++;
+					else if (pos > posStart) {
+						posEnd = pos;
+						break;
+					}
+					pos = strstr(posStart, " ");
+				}
+				len = posEnd - posStart;
+				strncpy(buf, posStart, len);
+				buf[len] = 0;
+				//pr_info("val str : %s\n", buf);
+				*val = my_atoi(buf);
+			} else {
+				pr_err(" > not found in this line!\n");
+				goto error_exit;
+			}
+		} else {
+			pr_err(" < not found in this line, please try find [\n");
+			goto error_exit;
+		}
+	} else {
+		pr_err(" = not found in this line!\n");
+		goto error_exit;
+	}
+	return true;
+
+error_exit:
+	return false;
+}
+
+void dsi_panel_mot_parse_timing_from_file(struct dsi_display *display, int index)
+{
+	int rc = 0;
+	u32 val = 0;
+	u32 keylen, llen, cmdstrlen;
+	struct dsi_display_mode *display_mode;
+	struct dsi_display_mode_priv_info *priv_info;
+	char * fwbuf = NULL;
+	char * pbuf = NULL;
+	char * pline = NULL;
+	char * plinebuf = NULL;
+	char * plineEnd = NULL;
+	const struct firmware *fw = NULL;
+	struct dsi_mode_info *mode_timing = NULL ;
+
+	if (!display) {
+		pr_warn("display is null\n");
+		return;
+	}
+
+	mode_timing = &display->modes[index].timing;
+	pr_info(", index: %d !\n", index);
+	pr_info("panel horz active:%d front_portch:%d back_porch:%d pulse_width:%d h_skew:%d\n",
+		mode_timing->h_active, mode_timing->h_front_porch, mode_timing->h_back_porch, 	mode_timing->h_sync_width, mode_timing->h_skew);
+	pr_info("panel vert active:%d front_portch:%d back_porch:%d pulse_width:%d\n",
+		mode_timing->v_active, mode_timing->v_front_porch, mode_timing->v_back_porch, 	mode_timing->v_sync_width);
+
+	display_mode = &display->modes[index];//container_of(mode_timing, struct dsi_display_mode, timing);
+	priv_info = display->modes[index].priv_info;
+	pr_info("panel clk rate:%d mdp_transfer_time_us:%d refresh_rate:%d\n",
+		display_mode->priv_info->clk_rate_hz , display_mode->priv_info->mdp_transfer_time_us, mode_timing->refresh_rate);
+
+	rc = request_firmware(&fw, "lcd-paras.txt", &display->pdev->dev);//
+	if (rc < 0) {
+		dev_warn_once(&display->pdev->dev, "Request firmware failed - /sdcard/lcd-paras.txt (%d)\n", rc);
+		return;
+	}
+	pr_info("found LCD para debug file, length: %d !\n", fw->size);
+
+	if (fw->size < 8 || fw->size > 65536) {
+		dev_warn_once(&display->pdev->dev, "Invalid firmware size (%zu)\n", fw->size);
+	}
+
+	fwbuf = kmalloc(fw->size+1, GFP_KERNEL);
+	if (!fwbuf) {
+		pr_warn("kmalloc failed for fwbuf\n");
+		return;
+	}
+	memset(fwbuf, 0, fw->size + 1);
+	memcpy(fwbuf, fw->data, fw->size);
+	pbuf = fwbuf;
+
+	plinebuf = kmalloc(LCD_PARA_LINE_LEN, GFP_KERNEL);
+	memset(plinebuf, 0, LCD_PARA_LINE_LEN);
+	if (!plinebuf) {
+		pr_warn("kmalloc failed for pline\n");
+		goto timing_err_exit;
+		return;
+	}
+
+	plineEnd = strstr(pbuf, "\n");
+	if (plineEnd) {
+		llen = plineEnd - pbuf;
+		if (llen < LCD_PARA_LINE_LEN) {
+			//strncpy(plinebuf, pbuf, llen);
+			memcpy(plinebuf, pbuf, llen);
+			plinebuf[llen] = '\0';
+			pr_info("First line pre:  pbuf address(%llx), len%d, plinebuf[0]=%2x, plinebuf str: %s\n", pbuf, llen, plinebuf[0], plinebuf);
+			pline = dsi_panel_line_remove_front_space(plinebuf);
+			if (pline >= plinebuf)
+				llen -= (pline - plinebuf);
+			else {
+				pr_warn("error line a\n");
+				goto timing_err_exit;
+			}
+			pr_info("First line pst:  pbuf address(%llx), len%d, pline[0]=%2x, pline str: %s\n", pbuf, llen, pline[0], pline);
+			pbuf = plineEnd + 1;
+		} else {
+			pr_warn("too large line a\n");
+			goto timing_err_exit;
+		}
+	} else {
+		pr_warn("found no line\n");
+		goto timing_err_exit;
+	}
+
+	while (pbuf < (fwbuf + fw->size)) {
+
+		if ( strncmp(pline, "//", 2)  == 0) {
+			//go relaign pbuf
+			goto goContinue;
+		}
+		if ( strncmp(pline, "/*", 2)  == 0) {
+			//go relaign pbuf
+			goto goContinue;
+		}
+
+		// qcom,mdss-dsi-panel-clockrate
+		keylen = strlen("qcom,mdss-dsi-panel-clockrate");
+		if ( strncmp(pline, "qcom,mdss-dsi-panel-clockrate", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-panel-clockrate: %d\n", val);
+				mode_timing->clk_rate_hz = val;
+				display_mode->priv_info->clk_rate_hz = mode_timing->clk_rate_hz;
+			}
+		}
+
+		// qcom,mdss-mdp-transfer-time-us
+		keylen = strlen("qcom,mdss-mdp-transfer-time-us");
+		if ( strncmp(pline, "qcom,mdss-mdp-transfer-time-us", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-mdp-transfer-time-us: %d\n", val);
+				mode_timing->mdp_transfer_time_us = val;
+				display_mode->priv_info->mdp_transfer_time_us =	mode_timing->mdp_transfer_time_us;
+			}
+		}
+
+		// qcom,mdss-dsi-panel-framerate
+		keylen = strlen("qcom,mdss-dsi-panel-framerate");
+		if ( strncmp(pline, "qcom,mdss-dsi-panel-framerate", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-panel-framerate: %d\n", val);
+				mode_timing->refresh_rate = val;
+			}
+		}
+
+		// qcom,mdss-dsi-panel-width
+		keylen = strlen("qcom,mdss-dsi-panel-width");
+		if ( strncmp(pline, "qcom,mdss-dsi-panel-width", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-panel-width: %d\n", val);
+				mode_timing->h_active = val;
+			}
+		}
+
+		// qcom,mdss-dsi-h-front-porch
+		keylen = strlen("qcom,mdss-dsi-h-front-porch");
+		if ( strncmp(pline, "qcom,mdss-dsi-h-front-porch", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-h-front-porch: %d\n", val);
+				mode_timing->h_front_porch = val;
+			}
+		}
+
+		// qcom,mdss-dsi-h-back-porch
+		keylen = strlen("qcom,mdss-dsi-h-back-porch");
+		if ( strncmp(pline, "qcom,mdss-dsi-h-back-porch", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-h-back-porch: %d\n", val);
+				mode_timing->h_back_porch = val;
+			}
+		}
+
+		// qcom,mdss-dsi-h-pulse-width
+		keylen = strlen("qcom,mdss-dsi-h-pulse-width");
+		if ( strncmp(pline, "qcom,mdss-dsi-h-pulse-width", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-h-pulse-width: %d\n", val);
+				mode_timing->h_sync_width = val;
+			}
+		}
+
+		// qcom,mdss-dsi-h-sync-skew
+		keylen = strlen("qcom,mdss-dsi-h-sync-skew");
+		if ( strncmp(pline, "qcom,mdss-dsi-h-sync-skew", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-h-sync-skew: %d\n", val);
+				mode_timing->h_skew = val;
+			}
+		}
+
+		// qcom,mdss-dsi-panel-height
+		keylen = strlen("qcom,mdss-dsi-panel-height");
+		if ( strncmp(pline, "qcom,mdss-dsi-panel-height", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-panel-height: %d\n", val);
+				mode_timing->v_active = val;
+			}
+		}
+
+		// qcom,mdss-dsi-v-back-porch
+		keylen = strlen("qcom,mdss-dsi-v-back-porch");
+		if ( strncmp(pline, "qcom,mdss-dsi-v-back-porch", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-v-back-porch: %d\n", val);
+				mode_timing->v_back_porch = val;
+			}
+		}
+
+		// qcom,mdss-dsi-v-front-porch
+		keylen = strlen("qcom,mdss-dsi-v-front-porch");
+		if ( strncmp(pline, "qcom,mdss-dsi-v-front-porch", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-v-front-porch: %d\n", val);
+				mode_timing->v_front_porch = val;
+			}
+		}
+
+		// qcom,mdss-dsi-v-pulse-width
+		keylen = strlen("qcom,mdss-dsi-v-pulse-width");
+		if ( strncmp(pline, "qcom,mdss-dsi-v-pulse-width", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-v-pulse-width: %d\n", val);
+				mode_timing->v_sync_width = val;
+			}
+		}
+
+		// qcom,mdss-dsi-t-clk-post
+		keylen = strlen("qcom,mdss-dsi-t-clk-post");
+		if ( strncmp(pline, "qcom,mdss-dsi-t-clk-post", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-t-clk-post: %d\n", val);
+				display->panel->host_config.t_clk_post = val;
+			}
+		}
+
+		// qcom,mdss-dsi-t-clk-pre
+		keylen = strlen("qcom,mdss-dsi-t-clk-pre");
+		if ( strncmp(pline, "qcom,mdss-dsi-t-clk-pre", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-dsi-t-clk-pre: %d\n", val);
+				display->panel->host_config.t_clk_pre = val;
+			}
+		}
+
+		// qcom,mdss-pan-physical-width-dimension
+		keylen = strlen("qcom,mdss-pan-physical-width-dimension");
+		if ( strncmp(pline, "qcom,mdss-pan-physical-width-dimension", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-pan-physical-width-dimension: %d\n", val);
+				display->panel->phy_props.panel_width_mm = val;
+			}
+		}
+
+		// qcom,mdss-pan-physical-height-dimension
+		keylen = strlen("qcom,mdss-pan-physical-height-dimension");
+		if ( strncmp(pline, "qcom,mdss-pan-physical-height-dimension", keylen)  == 0) {
+			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
+				pr_info("got qcom,mdss-pan-physical-height-dimension: %d\n", val);
+				display->panel->phy_props.panel_height_mm = val;
+			}
+		}
+
+		// qcom,mdss-dsi-on-command
+		keylen = strlen("qcom,mdss-dsi-on-command");
+		if ( strncmp(pline, "qcom,mdss-dsi-on-command", keylen)  == 0) {
+			if (dsi_panel_mot_parse_commands(pbuf - llen + keylen -1, &cmdstrlen, priv_info, DSI_CMD_SET_ON, pbuf)) {
+				pr_info("got qcom,mdss-dsi-on-command: str lenght: %d\n", cmdstrlen);
+				pbuf += cmdstrlen;
+			}
+		}
+
+		// qcom,mdss-dsi-off-command
+		keylen = strlen("qcom,mdss-dsi-off-command");
+		if ( strncmp(pline, "qcom,mdss-dsi-off-command", keylen)  == 0) {
+			if (dsi_panel_mot_parse_commands(pbuf - llen + keylen -1, &cmdstrlen, priv_info, DSI_CMD_SET_OFF, pbuf)) {
+				pr_info("got qcom,mdss-dsi-off-command: lenght: %d\n", cmdstrlen);
+				pbuf += cmdstrlen;
+			}
+		}
+
+goContinue:
+		memset(plinebuf, 0, LCD_PARA_LINE_LEN);
+		plineEnd = strstr(pbuf, "\n");
+		if (plineEnd) {
+			llen = plineEnd - pbuf;
+			if (llen < LCD_PARA_LINE_LEN) {
+				//strncpy(plinebuf, pbuf, llen);
+				memcpy(plinebuf, pbuf, llen);
+				plinebuf[llen] = '\0';
+				//pr_info("New line pre:  pbuf address(%llx), len%d, plinebuf[0]=%2x, plinebuf str: %s\n", pbuf, llen, plinebuf[0], plinebuf);
+				pline = dsi_panel_line_remove_front_space(plinebuf);
+				if (pline >= plinebuf)
+					llen -= (pline - plinebuf);
+				else {
+					pr_warn("error line b\n");
+					goto timing_err_exit;
+				}
+				if (llen > 7)
+					pr_info("New line pst:  pbuf(%llx),  pbuf[0][1][2][3][4][5][6][7]=[%2x][%2x][%2x][%2x][%2x][%2x][%2x][%2x], len %d, pline[0]=%2x, pline str: %s\n",
+						pbuf, pbuf[0], pbuf[1], pbuf[2], pbuf[3], pbuf[4], pbuf[5], pbuf[6], pbuf[7], llen, pline[0], pline);
+				pbuf = plineEnd + 1;
+			} else {
+				pr_warn("too large line b\n");
+				goto timing_err_exit;
+			}
+		} else {
+			llen = fwbuf + fw->size - pbuf;
+			memcpy(plinebuf, pbuf, llen);
+			plinebuf[llen] = '\0';
+			pr_info("End line:  pbuf(%llx): len%d:  %s\n", pbuf, llen, plinebuf);
+			break;
+		}
+
+	}
+
+timing_err_exit:
+	if (plinebuf)
+		kfree(plinebuf);
+	if (fwbuf)
+		kfree(fwbuf);
+	release_firmware(fw);
+	return;
+}
+
+static ssize_t dsi_display_early_power_read(struct device *dev,
+	struct device_attribute *attr, char *buf)
+{
+	int rc = 0;
+	struct dsi_display *display;
+
+	display = dev_get_drvdata(dev);
+	if (!display) {
+		pr_err("Invalid display\n");
+		return -EINVAL;
+	}
+
+	rc = snprintf(buf, PAGE_SIZE, "%d\n", display->dsi_mot_ext.early_power_state);
+	pr_info("%s: early_power_state %d\n", __func__,
+		display->dsi_mot_ext.early_power_state);
+
+	return rc;
+}
+
+static ssize_t dsi_display_early_power_write(struct device *dev,
+	struct device_attribute *attr, const char *buf, size_t count)
+{
+	struct dsi_display *display;
+
+	display = dev_get_drvdata(dev);
+	if (!display) {
+		pr_err("Invalid display\n");
+		return count;
+	}
+
+	if (display->panel->panel_initialized) {
+		pr_err("panel already initialized\n");
+		return count;
+	}
+	pr_info("%s: early_power_state %d\n", __func__,
+		display->dsi_mot_ext.early_power_state);
+
+	ext_dsi_display_early_power_on();
+
+	return count;
+
+}
+
+static ssize_t dsi_display_wakup_get(struct device *dev,
+	struct device_attribute *attr, char *buf)
+{
+	int rc = 0;
+
+	rc = snprintf(buf, PAGE_SIZE, "%s: timerhandle:%p\n",  (g_wakeup_timer_interval==0)? "Stopped":"Started", g_wakeup_timer);
+	pr_info("%s:  %s: timerhandle:%p\n", __func__,  (g_wakeup_timer_interval==0)? "Stopped":"Started", g_wakeup_timer);
+
+	return rc;
+}
+
+static ssize_t dsi_display_wakup_set(struct device *dev,
+	struct device_attribute *attr, const char *buf, size_t count)
+{
+	struct dsi_display *display;
+	ktime_t now, add;
+	u16 val = 0;
+
+	display = dev_get_drvdata(dev);
+	if (!display) {
+		pr_err("Invalid display\n");
+		return count;
+	}
+
+	if (kstrtou16(buf, 16, &val) < 0)
+		return count;
+	g_wakeup_timer_interval = val&0x7fff;
+
+	pr_info("val: 0x%x(enable:0x%x : interval:%d seconds), early_power_state %d\n", val, (val&0x8000), g_wakeup_timer_interval,
+		display->dsi_mot_ext.early_power_state);
+
+	if (g_wakeup_timer == NULL) {
+		g_wakeup_timer = devm_kzalloc(&display->pdev->dev, sizeof(*g_wakeup_timer), GFP_KERNEL);
+		if (g_wakeup_timer) {
+			alarm_init(g_wakeup_timer, ALARM_BOOTTIME, dsi_display_wakeup_timer_func);
+		}
+		else {
+			pr_err("failed to init timer\n");
+			return count;
+		}
+	}
+
+	// 0xffff :   0x8000/enable/disable    0x7fff/interval seconds
+	if (val&0x8000) {
+		now = ktime_get_boottime();
+		add = ktime_set(g_wakeup_timer_interval, 0);
+		alarm_start(g_wakeup_timer, ktime_add(now, add));
+	}else {
+		if (g_wakeup_timer)
+			alarm_cancel(g_wakeup_timer);
+		g_wakeup_timer_interval = 0;
+	}
+	return count;
+}
+
+static ssize_t dsi_display_early_test_en_get(struct device *dev,
+	struct device_attribute *attr, char *buf)
+{
+	int rc = 0;
+
+	rc = snprintf(buf, PAGE_SIZE, "g_early_power_test_en: %d\n",   g_early_power_test_en);
+	pr_info("g_early_power_test_en:%d\n", g_early_power_test_en);
+
+	return rc;
+}
+
+static ssize_t dsi_display_early_test_en_set(struct device *dev,
+	struct device_attribute *attr, const char *buf, size_t count)
+{
+	struct dsi_display *display;
+	u16 val = 0;
+
+	display = dev_get_drvdata(dev);
+	if (!display) {
+		pr_err("Invalid display\n");
+		return count;
+	}
+
+	if (kstrtou16(buf, 10, &val) < 0)
+		return count;
+	g_early_power_test_en = val;
+
+	pr_info("interval:%d seconds, early_power_state %d, g_early_power_test_en %d\n",
+		g_wakeup_timer_interval, display->dsi_mot_ext.early_power_state, g_early_power_test_en);
+
+	return count;
+}
+
+static void dsi_display_show_para(char* buf, char* pbuf, enum dsi_cmd_set_type type, struct dsi_display_mode_priv_info *priv_info)
+{
+	int i,j,rc;
+	u8* data;
+	int count = priv_info->cmd_sets[type].count;
+
+	memset(pbuf, 0, PAGE_SIZE);
+	rc = snprintf(pbuf, PAGE_SIZE, "## count:%d ====\n", count);
+	strcat(buf, pbuf);
+	memset(pbuf, 0, PAGE_SIZE);
+	for (i=0; i<count; i++) {
+	rc = snprintf(pbuf, PAGE_SIZE, "%2x %2x %2x %2x %2x %2x   %2x ",
+			priv_info->cmd_sets[type].cmds[i].msg.type, 		//data0
+			priv_info->cmd_sets[type].cmds[i].last_command, 	//data1
+			priv_info->cmd_sets[type].cmds[i].msg.channel,	//data2
+			priv_info->cmd_sets[type].cmds[i].msg.flags&0x01,	//data3
+			priv_info->cmd_sets[type].cmds[i].post_wait_ms,	//data4
+			priv_info->cmd_sets[type].cmds[i].msg.tx_len&0xff00,	//data5
+			priv_info->cmd_sets[type].cmds[i].msg.tx_len&0x00ff	//data6
+			);
+		strcat(buf, pbuf);
+		data = (u8*)priv_info->cmd_sets[type].cmds[i].msg.tx_buf;
+		for (j=0; j<priv_info->cmd_sets[type].cmds[i].msg.tx_len; j++) {
+			memset(pbuf, 0, PAGE_SIZE);
+			rc = snprintf(pbuf, PAGE_SIZE, " %2x ", data[j]);
+			strcat(buf, pbuf);
+		}
+		strcat(buf, "\n");
+	}
+}
+
+static ssize_t dsi_display_parse_para_get(struct device *dev,
+	struct device_attribute *attr, char *buf)
+{
+	int rc = 0;
+	struct dsi_display *display;
+	u16 index = 0;
+	struct dsi_mode_info *mode_timing = NULL ;
+	struct dsi_display_mode *display_mode;
+	struct dsi_display_mode_priv_info *priv_info;
+	char* pbuf = NULL;
+
+	display = dev_get_drvdata(dev);
+	if (!display) {
+		pr_err("Invalid display\n");
+		return rc;
+	}
+	display_mode = &display->modes[index];
+	priv_info = display->modes[index].priv_info;
+	mode_timing = &display->modes[index].timing;
+
+	pbuf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+	if (pbuf) {
+		rc = snprintf(buf, PAGE_SIZE, "panel horz active:%d front_portch:%d back_porch:%d pulse_width:%d h_skew:%d\n",
+			mode_timing->h_active, mode_timing->h_front_porch, mode_timing->h_back_porch, 	mode_timing->h_sync_width, mode_timing->h_skew);
+		memset(pbuf, 0, PAGE_SIZE);
+		rc = snprintf(pbuf, PAGE_SIZE, "panel vert active:%d front_portch:%d back_porch:%d pulse_width:%d\n",
+			mode_timing->v_active, mode_timing->v_front_porch, mode_timing->v_back_porch, 	mode_timing->v_sync_width);
+		strcat(buf, pbuf);
+		memset(pbuf, 0, PAGE_SIZE);
+		rc = snprintf(pbuf, PAGE_SIZE, "panel clk rate:%d mdp_transfer_time_us:%d refresh_rate:%d\n",
+			display_mode->priv_info->clk_rate_hz , display_mode->priv_info->mdp_transfer_time_us, mode_timing->refresh_rate);
+		strcat(buf, pbuf);
+		dsi_display_show_para(buf, pbuf, DSI_CMD_SET_ON, priv_info);
+		dsi_display_show_para(buf, pbuf, DSI_CMD_SET_OFF, priv_info);
+		printk("%s\n", buf);
+
+	} else {
+		pr_warn("kmalloc failed\n" );
+	}
+
+	if (pbuf)
+		kfree(pbuf);
+	return rc;
+}
+
+// val 0: update the paras for the first modes
+static ssize_t dsi_display_parse_para_update(struct device *dev,
+	struct device_attribute *attr, const char *buf, size_t count)
+{
+	struct dsi_display *display;
+	u16 index = 0;
+
+	display = dev_get_drvdata(dev);
+	if (!display) {
+		pr_err("Invalid display\n");
+		return count;
+	}
+
+	if (kstrtou16(buf, 10, &index) < 0)
+		return count;
+
+	dsi_panel_mot_parse_timing_from_file(display, index);
+
+	return count;
+}
+
+///sys/devices/platform/soc/soc:qcom,dsi-display/
+static DEVICE_ATTR(dsi_display_early_power, 0644,
+			dsi_display_early_power_read,
+			dsi_display_early_power_write);
+static DEVICE_ATTR(dsi_display_wakeup, 0644,
+			dsi_display_wakup_get,
+			dsi_display_wakup_set);
+static DEVICE_ATTR(early_test_en, 0644,
+			dsi_display_early_test_en_get,
+			dsi_display_early_test_en_set);
+static DEVICE_ATTR(dsi_display_parse_para, 0644,
+			dsi_display_parse_para_get,
+			dsi_display_parse_para_update);
+
+
+static struct attribute *dsi_display_mot_ext_fs_attrs[] = {
+	&dev_attr_dsi_display_early_power.attr,
+	&dev_attr_dsi_display_wakeup.attr,
+	&dev_attr_early_test_en.attr,
+	&dev_attr_dsi_display_parse_para.attr,
+	NULL,
+};
+static struct attribute_group dsi_display_mot_ext_fs_attrs_group = {
+	.attrs = dsi_display_mot_ext_fs_attrs,
+};
+
+static int dsi_display_sysfs_ext_init(struct dsi_display *display)
+{
+	int rc = 0;
+	struct device *dev = &display->pdev->dev;
+
+	rc = sysfs_create_group(&dev->kobj,
+		&dsi_display_mot_ext_fs_attrs_group);
+
+	return rc;
+}
+
+static int dsi_display_sysfs_ext_deinit(struct dsi_display *display)
+{
+	struct device *dev = &display->pdev->dev;
+
+	sysfs_remove_group(&dev->kobj,
+		&dsi_display_mot_ext_fs_attrs_group);
+
+	return 0;
+}
+
+int dsi_display_ext_init(struct dsi_display *display)
+{
+	int rc = 0;
+
+	g_dsi_mot_ext = &display->dsi_mot_ext;
+	g_dsi_mot_ext->display = display;
+
+	dsi_display_sysfs_ext_init(display);
+
+	display->is_dsi_display_prepared = false;
+	display->is_dsi_mot_primary = false;
+	g_dsi_mot_ext->early_power_state = DSI_EARLY_POWER_STATE_NUM;
+	g_dsi_mot_ext->early_power_workq = create_singlethread_workqueue("dsi_early_power_workq");
+	if (!g_dsi_mot_ext->early_power_workq) {
+		pr_err("failed to create dsi early power workq!\n");
+		dsi_display_sysfs_ext_deinit(display);
+		return 0;
+	}
+
+	wakeup_source_init(&g_dsi_mot_ext->early_wake_src, "dsi_early_wakelock");
+
+	INIT_WORK(&g_dsi_mot_ext->early_on_work,
+				dsi_display_early_power_on_work);
+	INIT_DELAYED_WORK(&g_dsi_mot_ext->early_off_work,
+				dsi_display_early_power_off_work);
+	pr_info("dsi_display_ext_init success\n");
+
+	return rc;
+}
+
diff --git a/msm/dsi/dsi_display_mot_ext.h b/msm/dsi/dsi_display_mot_ext.h
new file mode 100644
index 000000000000..124df4194529
--- /dev/null
+++ b/msm/dsi/dsi_display_mot_ext.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2015-2019, The Linux Foundation.All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef _DSI_DISPLAY_MOT_EXT_H_
+#define _DSI_DISPLAY_MOT_EXT_H_
+
+#include <linux/types.h>
+#include <linux/bitops.h>
+#include <linux/debugfs.h>
+#include <linux/of_device.h>
+#include <linux/firmware.h>
+#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+
+#include "msm_drv.h"
+#include "dsi_defs.h"
+#include "dsi_ctrl.h"
+#include "dsi_phy.h"
+#include "dsi_panel.h"
+#include "sde_connector.h"
+#include "sde_motUtil.h"
+#include "dsi_display.h"
+#include <linux/alarmtimer.h>
+
+#define LCD_PARA_LINE_LEN 2*1024
+
+enum dsi_display_early_power_state {
+	DSI_EARLY_POWER_IDLE = 0,
+	DSI_EARLY_POWER_BEGIN,
+	DSI_EARLY_POWER_PREPARED,
+	DSI_EARLY_POWER_INITIALIZED,
+	DSI_EARLY_POWER_FORBIDDEN,
+	DSI_EARLY_POWER_STATE_NUM
+};
+
+struct dsi_mot_ext_feature {
+	struct dsi_display *display;
+	struct workqueue_struct *early_power_workq;
+	struct work_struct early_on_work;
+	struct delayed_work early_off_work;
+	enum dsi_display_early_power_state early_power_state;
+	struct wakeup_source early_wake_src;
+};
+
+/**
+ * dsi_display_ext_init() - Moto early power init
+ * @display:          Handle to display.
+ *
+ * Prepare for early power up sequences for the primary panel.
+ *
+ * Return: error code.
+ */
+int dsi_display_ext_init(struct dsi_display *display);
+
+#endif /* _DSI_DISPLAY_MOT_EXT_H_ */

From d0ce7b462182a9082b5c2a92cfbdc01104de2ce5 Mon Sep 17 00:00:00 2001
From: zhanggb <zhanggb@motorola.com>
Date: Fri, 29 Nov 2019 17:39:52 +0800
Subject: [PATCH 36/94] Kernel/display: mot extend - early power

Control early power feature useing another dts property as this
feature currently has affect on 60/90hz FPS switch.

Change-Id: Iddc603707e92e788ee2a21c741c8d920101a23ed
Reviewed-on: https://gerrit.mot.com/1463780
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509819
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c         |  24 ++--
 msm/dsi/dsi_display.h         |   1 +
 msm/dsi/dsi_display_mot_ext.c | 243 +++++++++++++++++-----------------
 3 files changed, 137 insertions(+), 131 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 6b9327069e38..4a9f0152356b 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -4046,7 +4046,9 @@ static int dsi_display_parse_dt(struct dsi_display *display)
 	/* Parse mot extend feature supporting */
 	display->is_dsi_mot_ext_enabled = of_property_read_bool(of_node,
 				"qcom,platform-mot-ext-feature-enable");
-	pr_info("is_dsi_mot_ext_enabled\n", display->is_dsi_mot_ext_enabled);
+	if ( display->is_dsi_mot_ext_enabled )
+		display->is_dsi_mot_early_power_enabled = of_property_read_bool(of_node, "qcom,platform-mot-early-power-enable");
+	pr_info("is_dsi_mot_ext_enabled %d, is_dsi_mot_early_power_enabled %d\n", display->is_dsi_mot_ext_enabled, display->is_dsi_mot_early_power_enabled);
 
 	DSI_DEBUG("success\n");
 error:
@@ -5736,7 +5738,8 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 	if ( display->is_dsi_mot_ext_enabled && index == DSI_PRIMARY ) {
 		dsi_display_ext_init(display);
 	}
-	pr_info("dsi_display_dev_probe: display(%p), name: %s, is_dsi_mot_ext_enabled=%d\n", display, (display->name==NULL)?"Null":display->name, display->is_dsi_mot_ext_enabled);
+	pr_info("dsi_display_dev_probe: display(%p), name: %s, is_dsi_mot_early_power_enabled=%d, is_dsi_mot_ext_enabled=%d\n",
+		display, (display->name==NULL)?"Null":display->name, display->is_dsi_mot_early_power_enabled, display->is_dsi_mot_ext_enabled);
 
 	return 0;
 end:
@@ -6353,7 +6356,7 @@ int dsi_display_get_info(struct drm_connector *connector,
 	if (!strcmp(display->display_type, "primary")) {
 		info->display_type = SDE_CONNECTOR_PRIMARY;
 		//Update panel info for Mot early power
-		if ( display->is_dsi_mot_ext_enabled )
+		if ( display->is_dsi_mot_early_power_enabled )
 			display->is_dsi_mot_primary = true;
 	}
 	else if (!strcmp(display->display_type, "secondary"))
@@ -7093,7 +7096,7 @@ int dsi_display_set_mode(struct dsi_display *display,
 	//This interface is called from dsi bridge, not moto early-power.
 	//It means it is system who want powr on display
 	//From now on early power on is forbidden
-	if ( display->is_dsi_mot_ext_enabled )
+	if ( display->is_dsi_mot_early_power_enabled )
 		display->dsi_mot_ext.early_power_state = DSI_EARLY_POWER_FORBIDDEN;
 
 error:
@@ -7476,7 +7479,7 @@ int dsi_display_prepare(struct dsi_display *display)
 	mutex_lock(&display->display_lock);
 
 	//Check if Mot early power is on going...
-	if ( display->is_dsi_mot_ext_enabled && display->is_dsi_display_prepared ) {
+	if ( display->is_dsi_mot_early_power_enabled && display->is_dsi_display_prepared ) {
 		pr_info("already prepared\n");
 		goto error;
 	}
@@ -7607,7 +7610,7 @@ int dsi_display_prepare(struct dsi_display *display)
 	}
 
 	//Update prepare statue for Mot early power
-	if ( display->is_dsi_mot_ext_enabled )
+	if ( display->is_dsi_mot_early_power_enabled )
 		display->is_dsi_display_prepared = true;
 
 	goto error;
@@ -8022,7 +8025,7 @@ int dsi_display_enable(struct dsi_display *display)
 	mutex_lock(&display->display_lock);
 
 	//Check if Mot early power is on going
-	if ( display->is_dsi_mot_ext_enabled && dsi_panel_initialized(display->panel)) {
+	if ( display->is_dsi_mot_early_power_enabled && dsi_panel_initialized(display->panel)) {
 		pr_info("panel already enabled\n");
 		goto error;
 	}
@@ -8182,7 +8185,6 @@ int dsi_display_pre_disable(struct dsi_display *display)
 				display->name, rc);
 	}
 
-
         //Update early power state
         //Here is called from dsi bridge, not moto early-power.
         //It means it is system who want powr off display
@@ -8219,7 +8221,7 @@ int dsi_display_disable(struct dsi_display *display)
 
 	//Check is Mot early power is on going
 	pr_info("display %p, name %s is_dsi_mot_primary(%d)\n", display, display->name, display->is_dsi_mot_primary);
-	if ( display->is_dsi_mot_ext_enabled && !display->is_dsi_display_prepared) {
+	if ( display->is_dsi_mot_early_power_enabled && !display->is_dsi_display_prepared) {
 		mutex_unlock(&display->display_lock);
 		pr_info("panel already unprepared\n");
 		return rc;
@@ -8289,7 +8291,7 @@ int dsi_display_unprepare(struct dsi_display *display)
 	mutex_lock(&display->display_lock);
 
 	//Check if Mot early power is on going
-	if ( display->is_dsi_mot_ext_enabled && !dsi_panel_initialized(display->panel)) {
+	if ( display->is_dsi_mot_early_power_enabled && !dsi_panel_initialized(display->panel)) {
 		mutex_unlock(&display->display_lock);
 		pr_info("panel already disabled\n");
 		return rc;
@@ -8363,7 +8365,7 @@ int dsi_display_unprepare(struct dsi_display *display)
 	}
 
 	//Update prepare state for Mot early power
-	if ( display->is_dsi_mot_ext_enabled )
+	if ( display->is_dsi_mot_early_power_enabled )
 		display->is_dsi_display_prepared = false;
 
 	mutex_unlock(&display->display_lock);
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index 2db7e0d03387..0e3c883ebbe7 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -268,6 +268,7 @@ struct dsi_display {
 	struct work_struct lp_rx_timeout_work;
 	/* used for moto feature early-pane- power to speed up the power on sequence */
 	bool is_dsi_mot_ext_enabled;
+	bool is_dsi_mot_early_power_enabled;
 	bool is_dsi_display_prepared;
 	bool is_dsi_mot_primary;
 	struct dsi_mot_ext_feature dsi_mot_ext;
diff --git a/msm/dsi/dsi_display_mot_ext.c b/msm/dsi/dsi_display_mot_ext.c
index 2d1c2a448baf..12b7a510fa4f 100644
--- a/msm/dsi/dsi_display_mot_ext.c
+++ b/msm/dsi/dsi_display_mot_ext.c
@@ -564,14 +564,22 @@ error_exit:
 	return true;
 }
 
-static bool dsi_panel_mot_parse_u32(char* str, u32* val)
+static bool dsi_panel_mot_parse_u32(char* str, const char* keystr, u32* val)
 {
 	char * pos = NULL;
 	char * posStart = NULL;
 	char * posEnd = NULL;
+	char* pContent = NULL;
 	char buf[64];
 	uint len = 0;
-	posStart = strstr(str, "=");
+	u32 keylen;
+
+	keylen = strlen(keystr);
+	if ( strncmp(str, keystr, keylen) )
+		return false;
+
+	pContent = str + keylen;
+	posStart = strstr(pContent, "=");
 	if (posStart) {
 		posStart = strstr(posStart, "<");
 		if (posStart) {
@@ -618,6 +626,7 @@ void dsi_panel_mot_parse_timing_from_file(struct dsi_display *display, int index
 	u32 keylen, llen, cmdstrlen;
 	struct dsi_display_mode *display_mode;
 	struct dsi_display_mode_priv_info *priv_info;
+	char keystr[128];
 	char * fwbuf = NULL;
 	char * pbuf = NULL;
 	char * pline = NULL;
@@ -708,157 +717,141 @@ void dsi_panel_mot_parse_timing_from_file(struct dsi_display *display, int index
 			goto goContinue;
 		}
 
-		// qcom,mdss-dsi-panel-clockrate
-		keylen = strlen("qcom,mdss-dsi-panel-clockrate");
-		if ( strncmp(pline, "qcom,mdss-dsi-panel-clockrate", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-panel-clockrate: %d\n", val);
-				mode_timing->clk_rate_hz = val;
-				display_mode->priv_info->clk_rate_hz = mode_timing->clk_rate_hz;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-panel-clockrate", &val)) {
+			pr_info("got qcom,mdss-dsi-panel-clockrate: %d\n", val);
+			mode_timing->clk_rate_hz = val;
+			display_mode->priv_info->clk_rate_hz = mode_timing->clk_rate_hz;
 		}
 
-		// qcom,mdss-mdp-transfer-time-us
-		keylen = strlen("qcom,mdss-mdp-transfer-time-us");
-		if ( strncmp(pline, "qcom,mdss-mdp-transfer-time-us", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-mdp-transfer-time-us: %d\n", val);
-				mode_timing->mdp_transfer_time_us = val;
-				display_mode->priv_info->mdp_transfer_time_us =	mode_timing->mdp_transfer_time_us;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-mdp-transfer-time-us", &val)) {
+			pr_info("got qcom,mdss-mdp-transfer-time-us: %d\n", val);
+			mode_timing->mdp_transfer_time_us = val;
+			display_mode->priv_info->mdp_transfer_time_us =	mode_timing->mdp_transfer_time_us;
 		}
 
-		// qcom,mdss-dsi-panel-framerate
-		keylen = strlen("qcom,mdss-dsi-panel-framerate");
-		if ( strncmp(pline, "qcom,mdss-dsi-panel-framerate", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-panel-framerate: %d\n", val);
-				mode_timing->refresh_rate = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-panel-framerate", &val)) {
+			pr_info("got qcom,mdss-dsi-panel-framerate: %d\n", val);
+			mode_timing->refresh_rate = val;
 		}
 
-		// qcom,mdss-dsi-panel-width
-		keylen = strlen("qcom,mdss-dsi-panel-width");
-		if ( strncmp(pline, "qcom,mdss-dsi-panel-width", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-panel-width: %d\n", val);
-				mode_timing->h_active = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-panel-width", &val)) {
+			pr_info("got qcom,mdss-dsi-panel-width: %d\n", val);
+			mode_timing->h_active = val;
 		}
 
-		// qcom,mdss-dsi-h-front-porch
-		keylen = strlen("qcom,mdss-dsi-h-front-porch");
-		if ( strncmp(pline, "qcom,mdss-dsi-h-front-porch", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-h-front-porch: %d\n", val);
-				mode_timing->h_front_porch = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-h-front-porch", &val)) {
+			pr_info("got qcom,mdss-dsi-h-front-porch: %d\n", val);
+			mode_timing->h_front_porch = val;
 		}
 
-		// qcom,mdss-dsi-h-back-porch
-		keylen = strlen("qcom,mdss-dsi-h-back-porch");
-		if ( strncmp(pline, "qcom,mdss-dsi-h-back-porch", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-h-back-porch: %d\n", val);
-				mode_timing->h_back_porch = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-h-back-porch", &val)) {
+			pr_info("got qcom,mdss-dsi-h-back-porch: %d\n", val);
+			mode_timing->h_back_porch = val;
 		}
 
-		// qcom,mdss-dsi-h-pulse-width
-		keylen = strlen("qcom,mdss-dsi-h-pulse-width");
-		if ( strncmp(pline, "qcom,mdss-dsi-h-pulse-width", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-h-pulse-width: %d\n", val);
-				mode_timing->h_sync_width = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-h-pulse-width", &val)) {
+			pr_info("got qcom,mdss-dsi-h-pulse-width: %d\n", val);
+			mode_timing->h_sync_width = val;
 		}
 
-		// qcom,mdss-dsi-h-sync-skew
-		keylen = strlen("qcom,mdss-dsi-h-sync-skew");
-		if ( strncmp(pline, "qcom,mdss-dsi-h-sync-skew", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-h-sync-skew: %d\n", val);
-				mode_timing->h_skew = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-h-sync-skew", &val)) {
+			pr_info("got qcom,mdss-dsi-h-sync-skew: %d\n", val);
+			mode_timing->h_skew = val;
 		}
 
-		// qcom,mdss-dsi-panel-height
-		keylen = strlen("qcom,mdss-dsi-panel-height");
-		if ( strncmp(pline, "qcom,mdss-dsi-panel-height", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-panel-height: %d\n", val);
-				mode_timing->v_active = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-panel-height", &val)) {
+			pr_info("got qcom,mdss-dsi-panel-height: %d\n", val);
+			mode_timing->v_active = val;
 		}
 
-		// qcom,mdss-dsi-v-back-porch
-		keylen = strlen("qcom,mdss-dsi-v-back-porch");
-		if ( strncmp(pline, "qcom,mdss-dsi-v-back-porch", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-v-back-porch: %d\n", val);
-				mode_timing->v_back_porch = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-v-back-porch", &val)) {
+			pr_info("got qcom,mdss-dsi-v-back-porch: %d\n", val);
+			mode_timing->v_back_porch = val;
 		}
 
-		// qcom,mdss-dsi-v-front-porch
-		keylen = strlen("qcom,mdss-dsi-v-front-porch");
-		if ( strncmp(pline, "qcom,mdss-dsi-v-front-porch", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-v-front-porch: %d\n", val);
-				mode_timing->v_front_porch = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-v-front-porch", &val)) {
+			pr_info("got qcom,mdss-dsi-v-front-porch: %d\n", val);
+			mode_timing->v_front_porch = val;
 		}
 
-		// qcom,mdss-dsi-v-pulse-width
-		keylen = strlen("qcom,mdss-dsi-v-pulse-width");
-		if ( strncmp(pline, "qcom,mdss-dsi-v-pulse-width", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-v-pulse-width: %d\n", val);
-				mode_timing->v_sync_width = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-v-pulse-width", &val)) {
+			pr_info("got qcom,mdss-dsi-v-pulse-width: %d\n", val);
+			mode_timing->v_sync_width = val;
 		}
 
-		// qcom,mdss-dsi-t-clk-post
-		keylen = strlen("qcom,mdss-dsi-t-clk-post");
-		if ( strncmp(pline, "qcom,mdss-dsi-t-clk-post", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-t-clk-post: %d\n", val);
-				display->panel->host_config.t_clk_post = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-t-clk-post", &val)) {
+			pr_info("got qcom,mdss-dsi-t-clk-post: %d\n", val);
+			display->panel->host_config.t_clk_post = val;
 		}
 
-		// qcom,mdss-dsi-t-clk-pre
-		keylen = strlen("qcom,mdss-dsi-t-clk-pre");
-		if ( strncmp(pline, "qcom,mdss-dsi-t-clk-pre", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-dsi-t-clk-pre: %d\n", val);
-				display->panel->host_config.t_clk_pre = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsi-t-clk-pre", &val)) {
+			pr_info("got qcom,mdss-dsi-t-clk-pre: %d\n", val);
+			display->panel->host_config.t_clk_pre = val;
 		}
 
-		// qcom,mdss-pan-physical-width-dimension
-		keylen = strlen("qcom,mdss-pan-physical-width-dimension");
-		if ( strncmp(pline, "qcom,mdss-pan-physical-width-dimension", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-pan-physical-width-dimension: %d\n", val);
-				display->panel->phy_props.panel_width_mm = val;
-			}
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-pan-physical-width-dimension", &val)) {
+			pr_info("got qcom,mdss-pan-physical-width-dimension: %d\n", val);
+			display->panel->phy_props.panel_width_mm = val;
 		}
 
-		// qcom,mdss-pan-physical-height-dimension
-		keylen = strlen("qcom,mdss-pan-physical-height-dimension");
-		if ( strncmp(pline, "qcom,mdss-pan-physical-height-dimension", keylen)  == 0) {
-			if (dsi_panel_mot_parse_u32(pline+keylen, &val)) {
-				pr_info("got qcom,mdss-pan-physical-height-dimension: %d\n", val);
-				display->panel->phy_props.panel_height_mm = val;
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-pan-physical-height-dimension", &val)) {
+			pr_info("got qcom,mdss-pan-physical-height-dimension: %d\n", val);
+			display->panel->phy_props.panel_height_mm = val;
+		}
+
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsc-version", &val)) {
+			pr_info("got qcom,mdss-dsc-version: %d\n", val);
+			display_mode->priv_info->dsc.version = val & 0xff;
+		}
+
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsc-scr-version", &val)) {
+			pr_info("got qcom,mdss-dsc-scr-version: %d\n", val);
+			display_mode->priv_info->dsc.scr_rev = val & 0xff;
+		}
+
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsc-slice-height", &val)) {
+			pr_info("got qcom,mdss-dsc-slice-height: %d\n", val);
+			display_mode->priv_info->dsc.slice_height = val;
+		}
+
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsc-slice-width", &val)) {
+			pr_info("got qcom,mdss-dsc-slice-width: %d\n", val);
+			display_mode->priv_info->dsc.slice_width = val;
+			if (display_mode->timing.h_active % priv_info->dsc.slice_width) {
+				pr_err("invalid slice width for the intf width:%d slice width:%d\n",
+					display_mode->timing.h_active, display_mode->priv_info->dsc.slice_width);
 			}
+			display_mode->priv_info->dsc.pic_width = display_mode->timing.h_active;
+			display_mode->priv_info->dsc.pic_height = display_mode->timing.v_active;
+		}
+
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsc-slice-per-pkt", &val)) {
+			pr_info("got qcom,mdss-dsc-slice-per-pkt: %d\n", val);
+			display_mode->priv_info->dsc.slice_per_pkt = val;
+		}
+
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsc-bit-per-component", &val)) {
+			pr_info("got qcom,mdss-dsc-bit-per-component: %d\n", val);
+			display_mode->priv_info->dsc.bpc = val;
+		}
+
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-dsc-bit-per-pixel", &val)) {
+			pr_info("got qcom,mdss-dsc-bit-per-pixel: %d\n", val);
+			display_mode->priv_info->dsc.bpp = val;
+		}
+
+		if (dsi_panel_mot_parse_u32(pline, "qcom,mdss-pps-delay-ms", &val)) {
+			pr_info("got qcom,mdss-pps-delay-ms: %d\n", val);
+			display_mode->priv_info->dsc.pps_delay_ms = val;
 		}
 
 		// qcom,mdss-dsi-on-command
-		keylen = strlen("qcom,mdss-dsi-on-command");
-		if ( strncmp(pline, "qcom,mdss-dsi-on-command", keylen)  == 0) {
+		memset(keystr, 0, 128);
+		strcpy(keystr, "qcom,mdss-dsi-on-command");
+		keylen = strlen(keystr);
+		if ( strncmp(pline, keystr, keylen)  == 0) {
 			if (dsi_panel_mot_parse_commands(pbuf - llen + keylen -1, &cmdstrlen, priv_info, DSI_CMD_SET_ON, pbuf)) {
-				pr_info("got qcom,mdss-dsi-on-command: str lenght: %d\n", cmdstrlen);
+				pr_info("got %s: str lenght: %d\n", keystr, cmdstrlen);
 				pbuf += cmdstrlen;
 			}
 		}
@@ -872,6 +865,15 @@ void dsi_panel_mot_parse_timing_from_file(struct dsi_display *display, int index
 			}
 		}
 
+		// qcom,mdss-dsi-timing-switch-command
+		keylen = strlen("qcom,mdss-dsi-timing-switch-command");
+		if ( strncmp(pline, "qcom,mdss-dsi-timing-switch-command", keylen)  == 0) {
+			if (dsi_panel_mot_parse_commands(pbuf - llen + keylen -1, &cmdstrlen, priv_info, DSI_CMD_SET_TIMING_SWITCH, pbuf)) {
+				pr_info("got qcom,mdss-dsi-timing-switch-command: lenght: %d\n", cmdstrlen);
+				pbuf += cmdstrlen;
+			}
+		}
+
 goContinue:
 		memset(plinebuf, 0, LCD_PARA_LINE_LEN);
 		plineEnd = strstr(pbuf, "\n");
@@ -1112,6 +1114,7 @@ static ssize_t dsi_display_parse_para_get(struct device *dev,
 		strcat(buf, pbuf);
 		dsi_display_show_para(buf, pbuf, DSI_CMD_SET_ON, priv_info);
 		dsi_display_show_para(buf, pbuf, DSI_CMD_SET_OFF, priv_info);
+		dsi_display_show_para(buf, pbuf, DSI_CMD_SET_TIMING_SWITCH, priv_info);
 		printk("%s\n", buf);
 
 	} else {
@@ -1200,8 +1203,8 @@ int dsi_display_ext_init(struct dsi_display *display)
 
 	dsi_display_sysfs_ext_init(display);
 
-	display->is_dsi_display_prepared = false;
-	display->is_dsi_mot_primary = false;
+	//display->is_dsi_display_prepared = false;
+	//display->is_dsi_mot_primary = false;
 	g_dsi_mot_ext->early_power_state = DSI_EARLY_POWER_STATE_NUM;
 	g_dsi_mot_ext->early_power_workq = create_singlethread_workqueue("dsi_early_power_workq");
 	if (!g_dsi_mot_ext->early_power_workq) {

From e2487cf114d37d0d1721c487a46bfb4d92f1ebff Mon Sep 17 00:00:00 2001
From: zhanggb <zhanggb@motorola.com>
Date: Tue, 3 Dec 2019 12:33:13 +0800
Subject: [PATCH 37/94] Kernel/Display: mot extend code: get lcd para

Use below command to get current dsi panel command:
adb shell "cat /sys/devices/platform/soc/soc:qcom,dsi-display-primary/
dsi_display_parse_para"

Change-Id: I7d3624da8cffc4ae4b42054c323d9ecfa6caa5c3
Reviewed-on: https://gerrit.mot.com/1464821
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509820
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display_mot_ext.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/msm/dsi/dsi_display_mot_ext.c b/msm/dsi/dsi_display_mot_ext.c
index 12b7a510fa4f..46c355845a91 100644
--- a/msm/dsi/dsi_display_mot_ext.c
+++ b/msm/dsi/dsi_display_mot_ext.c
@@ -1056,7 +1056,7 @@ static void dsi_display_show_para(char* buf, char* pbuf, enum dsi_cmd_set_type t
 	int count = priv_info->cmd_sets[type].count;
 
 	memset(pbuf, 0, PAGE_SIZE);
-	rc = snprintf(pbuf, PAGE_SIZE, "## count:%d ====\n", count);
+	rc = snprintf(pbuf, PAGE_SIZE, "##Command for %s: count:%d ====\n", cmd_set_prop_map[type], count);
 	strcat(buf, pbuf);
 	memset(pbuf, 0, PAGE_SIZE);
 	for (i=0; i<count; i++) {
@@ -1090,6 +1090,7 @@ static ssize_t dsi_display_parse_para_get(struct device *dev,
 	struct dsi_display_mode *display_mode;
 	struct dsi_display_mode_priv_info *priv_info;
 	char* pbuf = NULL;
+	char* psubbuf = NULL;
 
 	display = dev_get_drvdata(dev);
 	if (!display) {
@@ -1100,27 +1101,35 @@ static ssize_t dsi_display_parse_para_get(struct device *dev,
 	priv_info = display->modes[index].priv_info;
 	mode_timing = &display->modes[index].timing;
 
-	pbuf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+	pbuf = kzalloc(PAGE_SIZE*4, GFP_KERNEL);
 	if (pbuf) {
-		rc = snprintf(buf, PAGE_SIZE, "panel horz active:%d front_portch:%d back_porch:%d pulse_width:%d h_skew:%d\n",
+		psubbuf = kzalloc(PAGE_SIZE, GFP_KERNEL);
+		if (!psubbuf)
+			return rc;
+		rc = snprintf(psubbuf, PAGE_SIZE, "panel horz active:%d front_portch:%d back_porch:%d pulse_width:%d h_skew:%d\n",
 			mode_timing->h_active, mode_timing->h_front_porch, mode_timing->h_back_porch, 	mode_timing->h_sync_width, mode_timing->h_skew);
-		memset(pbuf, 0, PAGE_SIZE);
-		rc = snprintf(pbuf, PAGE_SIZE, "panel vert active:%d front_portch:%d back_porch:%d pulse_width:%d\n",
+		strcat(pbuf, psubbuf);
+		memset(psubbuf, 0, PAGE_SIZE);
+		rc = snprintf(psubbuf, PAGE_SIZE, "panel vert active:%d front_portch:%d back_porch:%d pulse_width:%d\n",
 			mode_timing->v_active, mode_timing->v_front_porch, mode_timing->v_back_porch, 	mode_timing->v_sync_width);
-		strcat(buf, pbuf);
-		memset(pbuf, 0, PAGE_SIZE);
-		rc = snprintf(pbuf, PAGE_SIZE, "panel clk rate:%d mdp_transfer_time_us:%d refresh_rate:%d\n",
+		strcat(pbuf, psubbuf);
+		memset(psubbuf, 0, PAGE_SIZE);
+		rc = snprintf(psubbuf, PAGE_SIZE, "panel clk rate:%d mdp_transfer_time_us:%d refresh_rate:%d\n",
 			display_mode->priv_info->clk_rate_hz , display_mode->priv_info->mdp_transfer_time_us, mode_timing->refresh_rate);
-		strcat(buf, pbuf);
-		dsi_display_show_para(buf, pbuf, DSI_CMD_SET_ON, priv_info);
-		dsi_display_show_para(buf, pbuf, DSI_CMD_SET_OFF, priv_info);
-		dsi_display_show_para(buf, pbuf, DSI_CMD_SET_TIMING_SWITCH, priv_info);
+		strcat(pbuf, psubbuf);
+		memset(psubbuf, 0, PAGE_SIZE);
+		dsi_display_show_para(pbuf, psubbuf, DSI_CMD_SET_ON, priv_info);
+		dsi_display_show_para(pbuf, psubbuf, DSI_CMD_SET_OFF, priv_info);
+		dsi_display_show_para(pbuf, psubbuf, DSI_CMD_SET_TIMING_SWITCH, priv_info);
+		rc = snprintf(buf, PAGE_SIZE, "%s\n", pbuf);
 		printk("%s\n", buf);
 
 	} else {
 		pr_warn("kmalloc failed\n" );
 	}
 
+	if (psubbuf)
+		kfree(psubbuf);
 	if (pbuf)
 		kfree(pbuf);
 	return rc;

From 873665656a52de3c3d382ce462ec4e23c75f5e36 Mon Sep 17 00:00:00 2001
From: a7301c <a7301c@motorola.com>
Date: Thu, 5 Dec 2019 14:00:00 -0600
Subject: [PATCH 38/94] Revert "Revert "disp: msm: sde: update splash resource
 allocation for dual display""

Which causes dsi errors and white display:
+++Backtrace as below++++
01-01 00:48:06.812     0     0 I         : clk_branch_toggle+0x138/0x180
01-01 00:48:06.812     0     0 I         : clk_branch2_enable+0x28/0x38
01-01 00:48:06.812     0     0 I         : clk_core_enable+0x154/0x378
01-01 00:48:06.812     0     0 I         : clk_enable+0x2c/0x98
01-01 00:48:06.812     0     0 I         :
dsi_link_hs_clk_start+0x190/0x2b0
01-01 00:48:06.812     0     0 I         :
dsi_display_link_clk_enable+0x80/0x1f8
01-01 00:48:06.812     0     0 I         :
dsi_clk_update_link_clk_state+0x108/0x2c0
01-01 00:48:06.812     0     0 I         :
dsi_recheck_clk_state+0x238/0x4b8
01-01 00:48:06.812     0     0 I         : dsi_clk_req_state+0x1e8/0x260
01-01 00:48:06.812     0     0 I         :
dsi_display_clk_ctrl+0x44/0xa8
01-01 00:48:06.812     0     0 I         :
dsi_display_prepare+0x86c/0xba0
01-01 00:48:06.812     0     0 I         :
dsi_bridge_pre_enable+0x234/0x818
01-01 00:48:06.812     0     0 I         :
drm_bridge_pre_enable+0x34/0x40
01-01 00:48:06.812     0     0 I         : complete_commit+0x468/0xc18
01-01 00:48:06.812     0     0 I         :
_msm_drm_commit_work_cb+0x17c/0x308
01-01 00:48:06.812     0     0 I         : kthread_worker_fn+0x114/0x1f8
01-01 00:48:06.812     0     0 I         : kthread+0x128/0x138
01-01 00:48:06.812     0     0 I         : ret_from_fork+0x10/0x1c
01-01 00:48:06.812     0     0 I         : irq event stamp: 0
01-01 00:48:06.812     0     0 I         : hardirqs last  enabled at
(0): [<0000000000000000>]           (null)
01-01 00:48:06.812     0     0 I         : hardirqs last disabled at
(0): [<ffffff98feab7234>] copy_process+0x5f4/0x1bf8
01-01 00:48:06.812     0     0 I         : softirqs last  enabled at
(0): [<ffffff98feab724c>] copy_process+0x60c/0x1bf8
01-01 00:48:06.812     0     0 I         : softirqs last disabled at
(0): [<0000000000000000>]           (null)
01-01 00:48:06.812     0     0 W         : ---[ end trace
c6c359a711660861 ]---
01-01 00:48:06.817     0     0 E         : [drm:dsi_link_hs_clk_start]
*ERROR* [msm-dsi-error]: Failed to enable dsi byte clk, rc=-16
01-01 00:48:06.826     0     0 E         : [drm:dsi_link_hs_clk_start]
*ERROR* [msm-dsi-error]: failed to enable link HS clks, rc = -16
01-01 00:48:06.836     0     0 E         :
[drm:dsi_display_link_clk_enable] *ERROR* [msm-dsi-error]: failed to
turn on master hs link clocks, rc=-16
01-01 00:48:06.847     0     0 E         :
[drm:dsi_clk_update_link_clk_state] *ERROR* [msm-dsi-error]: failed to
start link clk type 2 rc=-16
01-01 00:48:06.857     0     0 E         : [drm:dsi_recheck_clk_state]
*ERROR* [msm-dsi-error]: failed to update clock state, rc = -16
01-01 00:48:06.867     0     0 E         : [drm:dsi_clk_req_state]
*ERROR* [msm-dsi-error]: Failed to adjust clock state rc = -16
01-01 00:48:06.876     0     0 E         : [drm:dsi_display_clk_ctrl]
*ERROR* [msm-dsi-error]: failed set clk state, rc = -16
01-01 00:48:06.885     0     0 E         : [drm:dsi_display_prepare]
*ERROR* [msm-dsi-error]: [qcom,mdss_dsi_mot_boe_269_800x600_cmd_v2]
failed to enable DSI link clocks, rc=-16
01-01 00:48:06.904     0     0 E dsi_pll_7nm_lock_status: DSI PLL(1)
lock failed, status=0x00000000
01-01 00:48:06.911     0     0 E dsi_pll_enable: PLL(1) lock failed
01-01 00:48:06.916     0     0 E vco_7nm_prepare: pll(1) enable failed,
rc=-110
01-01 00:48:06.921     0     0 E         : [drm:dsi_link_hs_clk_start]
*ERROR* [msm-dsi-error]: Failed to prepare dsi byte clk, rc=-110
01-01 00:48:06.931     0     0 E         : [drm:dsi_link_hs_clk_start]
*ERROR* [msm-dsi-error]: failed to prepare link HS clks, rc = -110
01-01 00:48:06.941     0     0 E         :
[drm:dsi_display_link_clk_enable] *ERROR* [msm-dsi-error]: failed to
turn on master hs link clocks, rc=-110
01-01 00:48:06.952     0     0 E         :
[drm:dsi_clk_update_link_clk_state] *ERROR* [msm-dsi-error]: failed to
start link clk type 2 rc=-110
01-01 00:48:06.963     0     0 E         : [drm:dsi_recheck_clk_state]
*ERROR* [msm-dsi-error]: failed to update clock state, rc = -110
01-01 00:48:06.972     0     0 E         : [drm:dsi_clk_req_state]
*ERROR* [msm-dsi-error]: Failed to adjust clock state rc = -110
01-01 00:48:06.982     0     0 E         : [drm:dsi_display_clk_ctrl]
*ERROR* [msm-dsi-error]: failed set clk state, rc = -110
01-01 00:48:06.991     0     0 I [drm:dsi_panel_post_unprepare]
[msm-dsi-info]: (mipi_mot_cmd_boe_800x600_269)+
+++
This reverts commit 1195a394b1e3dba05468bbe8556302b6b832318f.

Change-Id: I836e6496181c517c5995f53c68fd4856b00425b3
Signed-off-by: a7301c <a7301c@motorola.com>
Reviewed-on: https://gerrit.mot.com/1509821
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/sde/sde_rm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/sde/sde_rm.c b/msm/sde/sde_rm.c
index e77f9905ce3c..5f2410071248 100644
--- a/msm/sde/sde_rm.c
+++ b/msm/sde/sde_rm.c
@@ -1789,8 +1789,8 @@ int sde_rm_cont_splash_res_init(struct msm_drm_private *priv,
 			splash_display->cont_splash_enabled = true;
 			splash_display->ctl_ids[splash_display->ctl_cnt++] =
 				iter_c.blk->id;
+			index++;
 		}
-		index++;
 	}
 
 	return 0;

From ec79d98bce8b3fec493ea673f4a5b205a874a47c Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Mon, 25 Nov 2019 13:33:46 -0600
Subject: [PATCH 39/94] disp: msm: add display frequency change notification

Added notifier to inform registered consumers about display changing
frequency.

Change-Id: Ic619b233a03f002862d059bfea671d7b2c5807af
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1465621
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
(cherry picked from commit c69b88c83b5780c3ce858dbf362e0aa4a92b8c67)
Reviewed-on: https://gerrit.mot.com/1467534
Submit-Approved: Qiang Nie <nieqiang@motorola.com>
Tested-by: Qiang Nie <nieqiang@motorola.com>
Reviewed-on: https://gerrit.mot.com/1509822
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index d4aa67debb9c..7393553c6f9e 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -18,6 +18,10 @@
 #include "sde_dbg.h"
 #include "dsi_display.h"
 
+static struct blocking_notifier_head dsi_freq_head =
+			BLOCKING_NOTIFIER_INIT(dsi_freq_head);
+EXPORT_SYMBOL_GPL(dsi_freq_head);
+
 /**
  * topology is currently defined by a set of following 3 values:
  * 1. num of layer mixers
@@ -4785,6 +4789,10 @@ int dsi_panel_pre_mode_switch_to_video(struct dsi_panel *panel)
 		       panel->name, rc);
 
 	mutex_unlock(&panel->panel_lock);
+	/* notify consumers only if refresh rate has been updated */
+	if (!rc)
+		blocking_notifier_call_chain(&dsi_freq_head,
+			(unsigned long)panel->cur_mode->timing.refresh_rate, NULL);
 	return rc;
 }
 

From ae9b5e976eea3c51b3ebfe3dcfc5d8ddf10f5640 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Tue, 15 Jan 2019 17:34:44 +0800
Subject: [PATCH 40/94] disp: msm: support for HBM_FOD mode

FOD: Fingerprint of display.

For tianma panel, there are two hbm mode.
1. hbm
2. hbm for FOD(hbm_fod);
But for SMD panel ,there is only one HBM mode.

Port from 9701d728f

Change-Id: I1faceb257462c293068f44a17ffff3821af6f841
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1465690
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509823
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_defs.h  |  2 ++
 msm/dsi/dsi_panel.c | 16 ++++++++++++++++
 msm/dsi/dsi_panel.h |  4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 0c9f93a4ddb8..f47ad8cb60ab 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -281,6 +281,7 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_POST_TIMING_SWITCH:        Post timing switch
  * @DSI_CMD_SET_QSYNC_ON                   Enable qsync mode
  * @DSI_CMD_SET_QSYNC_OFF                  Disable qsync mode
+ * @DSI_CMD_SET_HBM_FOD_ON:                Turning HBM_FOD on
  * @DSI_CMD_SET_HBM_ON:                    Turning HBM on
  * @DSI_CMD_SET_HBM_OFF:                   Turning HBM off
  * @DSI_CMD_SET_ACL_ON:                    Turning ACL on
@@ -311,6 +312,7 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_POST_TIMING_SWITCH,
 	DSI_CMD_SET_QSYNC_ON,
 	DSI_CMD_SET_QSYNC_OFF,
+	DSI_CMD_SET_HBM_FOD_ON,
 	DSI_CMD_SET_HBM_ON,
 	DSI_CMD_SET_HBM_OFF,
 	DSI_CMD_SET_ACL_ON,
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 7393553c6f9e..7f4856ab46a7 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -109,6 +109,7 @@ static char dsi_dsc_rc_range_bpg_offset[] = {2, 0, 0, -2, -4, -6, -8, -8,
 static struct panel_param_val_map hbm_map[HBM_STATE_NUM] = {
 	{HBM_OFF_STATE, DSI_CMD_SET_HBM_OFF, NULL},
 	{HBM_ON_STATE, DSI_CMD_SET_HBM_ON, NULL},
+	{HBM_FOD_ON_STATE, DSI_CMD_SET_HBM_FOD_ON, NULL},
 };
 
 static struct panel_param_val_map acl_map[ACL_STATE_NUM] = {
@@ -871,6 +872,10 @@ static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
 		panel_param->default_value, panel_param->value);
 
 	mutex_lock(&panel->panel_lock);
+
+	if (param_info->value >= panel_param->val_max)
+		param_info->value = panel_param->val_max - 1;
+
 	if (panel_param->value == param_info->value)
 	{
 		DSI_INFO("(mode=%d): requested value=%d is same. Do nothing\n",
@@ -2059,6 +2064,7 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-post-mode-switch-on-command",
 	"qcom,mdss-dsi-qsync-on-commands",
 	"qcom,mdss-dsi-qsync-off-commands",
+	"qcom,mdss-dsi-hbm-fod-on-command",
 	"qcom,mdss-dsi-hbm-on-command",
 	"qcom,mdss-dsi-hbm-off-command",
 	"qcom,mdss-dsi-acl-on-command",
@@ -2089,6 +2095,7 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-post-mode-switch-on-command-state",
 	"qcom,mdss-dsi-qsync-on-commands-state",
 	"qcom,mdss-dsi-qsync-off-commands-state",
+	"qcom,mdss-dsi-hbm-fod-on-command-state",
 	"qcom,mdss-dsi-hbm-on-command-state",
 	"qcom,mdss-dsi-hbm-off-command-state",
 	"qcom,mdss-dsi-acl-on-command-state",
@@ -3644,6 +3651,12 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 			if (!prop)
 				continue;
 
+			if ((type == DSI_CMD_SET_HBM_FOD_ON) &&
+						(!panel->panel_hbm_fod)) {
+				param->val_max -= 1;
+				continue;
+			}
+
 			rc = dsi_panel_parse_cmd_sets_sub(param_map->cmds,
 							type, utils);
 			if (rc) {
@@ -3665,6 +3678,9 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 	if (panel->is_hbm_using_51_cmd)
 		DSI_INFO("HBM command is using 0x51 command\n");
 
+	panel->panel_hbm_fod = of_property_read_bool(of_node,
+				"qcom,mdss-dsi-hbm-fod");
+
 	return rc;
 
 parse_err:
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index af7ee9b6e60d..e019b2c96001 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -191,6 +191,7 @@ enum acl_state {
 enum hbm_state {
 	HBM_OFF_STATE = 0,
 	HBM_ON_STATE,
+	HBM_FOD_ON_STATE,
 	HBM_STATE_NUM
 };
 
@@ -203,7 +204,7 @@ struct panel_param_val_map {
 struct panel_param {
 	const char *param_name;
 	struct panel_param_val_map *val_map;
-	const u16 val_max;
+	u16 val_max;
 	const u16 default_value;
 	u16 value;
 	bool is_supported;
@@ -274,6 +275,7 @@ struct dsi_panel {
 	bool is_hbm_using_51_cmd;
 	bool is_hbm_on;
 	u32  bl_lvl_during_hbm;
+	bool panel_hbm_fod;
 
 	struct panel_param *param_cmds;
 };

From d99fbf35699774ac9ba508c93d3c39fe4700df5c Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Wed, 23 Jan 2019 15:03:45 +0800
Subject: [PATCH 41/94] disp: msm:: reset the param value to the default value

During the panel is enable, we reset the value of the panel register
with default setting.

Change-Id: I88cbfc24b825ed24c32f1922c12a9d7da4b014d0
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1465699
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509824
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c |  1 +
 msm/dsi/dsi_panel.c   | 11 +++++++++++
 msm/dsi/dsi_panel.h   |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 4a9f0152356b..973dae397ec7 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8061,6 +8061,7 @@ int dsi_display_enable(struct dsi_display *display)
 				display->name, rc);
 			goto error;
 		}
+		dsi_panel_reset_param(display->panel);
 	}
 
 	if (mode->dsi_mode_flags & DSI_MODE_FLAG_DMS) {
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 7f4856ab46a7..05b5dbbb6cbe 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -995,6 +995,17 @@ int dsi_panel_set_param(struct dsi_panel *panel,
 	return rc;
 }
 
+void dsi_panel_reset_param(struct dsi_panel *panel)
+{
+	struct panel_param *param;
+	int i;
+
+	for (i = 0; i < PARAM_ID_NUM; i++) {
+		param = &dsi_panel_param[0][i];
+		param->value = param->default_value;
+	}
+}
+
 static int dsi_panel_bl_register(struct dsi_panel *panel)
 {
 	int rc = 0;
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index e019b2c96001..90cdf12f0fbd 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -405,4 +405,6 @@ void dsi_panel_calc_dsi_transfer_time(struct dsi_host_common_cfg *config,
 int dsi_panel_set_param(struct dsi_panel *panel,
 			struct msm_param_info *param_info);
 
+void dsi_panel_reset_param(struct dsi_panel *panel);
+
 #endif /* _DSI_PANEL_H_ */

From b314019fb019d892f9d4c0331db699b5ddb83242 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 5 Dec 2019 15:09:26 -0600
Subject: [PATCH 42/94] disp: msm: Restore old backlight setting after exitting
 HBM

The backlight and HBM are using the same command 0x51. The backlight
ranger will be from 0x000 to 0x640 while HBM on will be at 0xfff and
HBM off will be at 0x640. This is why the display driver should
restore the last backlight setting after exiting the HBM mode.

Change-Id: I23b9e190924d13c9cdf50a6543033647395a8cf6
Signed-off-by: daiss1 <daiss1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1469387
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1509825
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 05b5dbbb6cbe..092acc6b59de 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -695,11 +695,14 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	else
 		rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);
 
-	if (panel->is_hbm_using_51_cmd && panel->is_hbm_on) {
+	if (panel->is_hbm_using_51_cmd) {
 		panel->bl_lvl_during_hbm = bl_lvl;
-		DSI_DEBUG("HBM is on.. ignore setting backlight. bl_vl=%d\n",
+
+		if (panel->is_hbm_on) {
+			DSI_DEBUG("HBM is on.. ignore setting backlight. bl_vl=%d\n",
 						panel->bl_lvl_during_hbm);
-		return 0;
+			return 0;
+		}
 	}
 
 	if (bl->bl_2bytes_enable)

From a7578d4a8e969daaf13b9dd7d675bae89447611c Mon Sep 17 00:00:00 2001
From: Nilaan Gunabalachandran <ngunabal@codeaurora.org>
Date: Wed, 30 Oct 2019 10:42:52 -0400
Subject: [PATCH 43/94] Revert"disp:msm:sde: update splash resource allocation
 for dual display"

This reverts commit dbb1a3eee9c1537610a5968b2027017dcde16a74.
This change causes regression in populating cont splash data for RM.

Mot-CRs-fixed: (CR)

Change-Id: If239eb921e022fcad54033ae3c7e9e4c3dc54736
Signed-off-by: Nilaan Gunabalachandran <ngunabal@codeaurora.org>
Reviewed-on: https://gerrit.mot.com/1468943
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Ling Jin <lingjin@motorola.com>
Reviewed-by: Bang Nguyen <bangnguyen@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509826
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/sde/sde_rm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/sde/sde_rm.c b/msm/sde/sde_rm.c
index 5f2410071248..e77f9905ce3c 100644
--- a/msm/sde/sde_rm.c
+++ b/msm/sde/sde_rm.c
@@ -1789,8 +1789,8 @@ int sde_rm_cont_splash_res_init(struct msm_drm_private *priv,
 			splash_display->cont_splash_enabled = true;
 			splash_display->ctl_ids[splash_display->ctl_cnt++] =
 				iter_c.blk->id;
-			index++;
 		}
+		index++;
 	}
 
 	return 0;

From 82b89e13189f38bd1fe6076119ed25f8304635db Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Tue, 10 Dec 2019 13:32:51 -0600
Subject: [PATCH 44/94] dsi: pushing display notifications

Pushing display notifications when it is turning on and off, so
registered listener can become aware of it state.

Change-Id: I94d83f640435fe73225befec09dc0d728e9dacd7
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1469860
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Eduardo Ferreira Barbosa <edufb@motorola.com>
Reviewed-by: Bang Nguyen <bangnguyen@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1471057
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Reviewed-by: Jianqi Yang <yangj@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Reviewed-on: https://gerrit.mot.com/1509827
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c |  8 ++++++--
 msm/dsi/dsi_display.h |  2 ++
 msm/dsi/dsi_panel.c   | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 973dae397ec7..53589718b956 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5675,11 +5675,15 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 
 	display->display_type = of_get_property(pdev->dev.of_node,
 				"label", NULL);
-	if (!display->display_type)
+	if (!display->display_type) {
 		display->display_type = "primary";
+		display->display_idx = 0;
+	}
 
-	if (!strcmp(display->display_type, "secondary"))
+	if (!strcmp(display->display_type, "secondary")) {
 		index = DSI_SECONDARY;
+		display->display_idx = 1;
+	}
 
 	boot_disp = &boot_displays[index];
 	node = pdev->dev.of_node;
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index 0e3c883ebbe7..9d7d02ba04d6 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -144,6 +144,7 @@ struct dsi_display_ext_bridge {
  * @ext_conn:         Pointer to external connector attached to DSI connector
  * @name:             Name of the display.
  * @display_type:     Display type as defined in device tree.
+ * @display_idx:      Display index (0-primary, 1-secondary)
  * @list:             List pointer.
  * @is_active:        Is display active.
  * @is_cont_splash_enabled:  Is continuous splash enabled
@@ -200,6 +201,7 @@ struct dsi_display {
 
 	const char *name;
 	const char *display_type;
+	int display_idx;
 	struct list_head list;
 	bool is_cont_splash_enabled;
 	bool sw_te_using_wd;
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 092acc6b59de..4c591080ae18 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -11,6 +11,17 @@
 #include <linux/pwm.h>
 #include <video/mipi_display.h>
 
+#if defined(CONFIG_PANEL_NOTIFICATIONS)
+#include <linux/panel_notifier.h>
+
+#define PANEL_NOTIFY(note) { \
+	int idx = dsi_panel_get_index(panel); \
+	panel_notify(note, (void *)&idx); \
+}
+#else
+#define PANEL_NOTIFY(...)
+#endif
+
 #include "dsi_display.h"
 #include "dsi_panel.h"
 #include "dsi_ctrl_hw.h"
@@ -4927,6 +4938,19 @@ int dsi_panel_post_switch(struct dsi_panel *panel)
 	return rc;
 }
 
+#if defined(CONFIG_PANEL_NOTIFICATIONS)
+static inline int dsi_panel_get_index(struct dsi_panel *panel)
+{
+	struct dsi_display *dsi_display =
+			container_of(panel->host, struct dsi_display, host);
+
+	if (unlikely(dsi_display == NULL))
+		return -EINVAL;
+
+	return dsi_display->display_idx;
+}
+#endif
+
 int dsi_panel_enable(struct dsi_panel *panel)
 {
 	int rc = 0;
@@ -4976,6 +5000,9 @@ int dsi_panel_enable(struct dsi_panel *panel)
 		DSI_INFO("-: no_panel_on_read_support is set\n");
 
 	panel->panel_initialized = true;
+
+	PANEL_NOTIFY(PANEL_EVENT_PRE_DISPLAY_ON);
+
 err:
 
 	mutex_unlock(&panel->panel_lock);
@@ -4999,6 +5026,9 @@ int dsi_panel_post_enable(struct dsi_panel *panel)
 		       panel->name, rc);
 		goto error;
 	}
+
+	PANEL_NOTIFY(PANEL_EVENT_DISPLAY_ON);
+
 error:
 	mutex_unlock(&panel->panel_lock);
 	return rc;
@@ -5022,6 +5052,8 @@ int dsi_panel_pre_disable(struct dsi_panel *panel)
 		goto error;
 	}
 
+	PANEL_NOTIFY(PANEL_EVENT_PRE_DISPLAY_OFF);
+
 error:
 	mutex_unlock(&panel->panel_lock);
 	return rc;
@@ -5066,6 +5098,8 @@ int dsi_panel_disable(struct dsi_panel *panel)
 	panel->panel_initialized = false;
 	panel->power_mode = SDE_MODE_DPMS_OFF;
 
+	PANEL_NOTIFY(PANEL_EVENT_DISPLAY_OFF);
+
 	mutex_unlock(&panel->panel_lock);
 	return rc;
 }

From a4931071089352ae8ea2275a3f33eeca9132927f Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 24 Oct 2019 15:13:53 -0500
Subject: [PATCH 45/94] disp: msm: Correct DSC 1.1 Rate control for Max val

Correct the DSC 1.1 Rate control for Max QP values for each ratio type
in dsi_dsc_ratio_type

Change-Id: I7888448618bfb180093a55afde142d2c8afdb72b
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1470114
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Bang Nguyen <bangnguyen@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509828
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 4c591080ae18..35517f910833 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -93,7 +93,7 @@ static char dsi_dsc_rc_range_min_qp_1_1_scr1[][15] = {
  */
 static char dsi_dsc_rc_range_max_qp_1_1[][15] = {
 	{4, 4, 5, 6, 7, 7, 7, 8, 9, 10, 11, 12, 13, 13, 15},
-	{4, 8, 9, 10, 11, 11, 11, 12, 13, 14, 15, 16, 17, 17, 19},
+	{8, 8, 9, 10, 11, 11, 11, 12, 13, 14, 15, 16, 17, 17, 19},
 	{12, 12, 13, 14, 15, 15, 15, 16, 17, 18, 19, 20, 21, 21, 23},
 	{7, 8, 9, 10, 11, 11, 11, 12, 13, 13, 14, 14, 15, 15, 16},
 	};

From 1f00fc0fe3b940ba6885ac44c5a41c34e0d15b34 Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Thu, 19 Dec 2019 13:17:31 -0600
Subject: [PATCH 46/94] msm: dsi_panel: refresh rate config option

Make refresh rate change notification configurable through
CONFIG_DRM_DYNANMIC_REFRESH_RATE defconfig option.

Change-Id: I8214d97af698c0d0fdc0bfabbdcc5e1184da2291
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1474842
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jialei Hao <haojl2@motorola.com>
Reviewed-by: Jichao Zou <zoujc@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509829
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 35517f910833..b876171f935f 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -29,10 +29,11 @@
 #include "sde_dbg.h"
 #include "dsi_display.h"
 
+#if defined(CONFIG_DRM_DYNAMIC_REFRESH_RATE)
 static struct blocking_notifier_head dsi_freq_head =
 			BLOCKING_NOTIFIER_INIT(dsi_freq_head);
 EXPORT_SYMBOL_GPL(dsi_freq_head);
-
+#endif
 /**
  * topology is currently defined by a set of following 3 values:
  * 1. num of layer mixers
@@ -4830,10 +4831,12 @@ int dsi_panel_pre_mode_switch_to_video(struct dsi_panel *panel)
 		       panel->name, rc);
 
 	mutex_unlock(&panel->panel_lock);
+#if defined(CONFIG_DRM_DYNAMIC_REFRESH_RATE)
 	/* notify consumers only if refresh rate has been updated */
 	if (!rc)
 		blocking_notifier_call_chain(&dsi_freq_head,
 			(unsigned long)panel->cur_mode->timing.refresh_rate, NULL);
+#endif
 	return rc;
 }
 

From 7cf7caf775b46c121f51023314ccdb22023eb00e Mon Sep 17 00:00:00 2001
From: haojl2 <haojl2@motorola.com>
Date: Mon, 23 Dec 2019 12:11:11 +0800
Subject: [PATCH 47/94] msm: dsi_panel: refresh rate config option

TP:
Need to enforce CONFIG_DRM_DYNAMIC_REFRESH_RATE option within techpak
for racer.

Change-Id: I05b9749a138407d9eb627040f65d7e29588b226f
Signed-off-by: haojl2 <haojl2@motorola.com>
Reviewed-on: https://gerrit.mot.com/1475865
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jichao Zou <zoujc@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509830
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 config/saipdisp.conf  | 1 +
 config/saipdispconf.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/saipdisp.conf b/config/saipdisp.conf
index dbbf3c847dbb..59c283c3455a 100644
--- a/config/saipdisp.conf
+++ b/config/saipdisp.conf
@@ -11,3 +11,4 @@ export CONFIG_QCOM_MDSS_PLL=y
 export CONFIG_MSM_SDE_ROTATOR=y
 export CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
 export CONFIG_DRM_SDE_RSC=y
+export CONFIG_DRM_DYNAMIC_REFRESH_RATE=y
diff --git a/config/saipdispconf.h b/config/saipdispconf.h
index 049024839701..09dc500defab 100644
--- a/config/saipdispconf.h
+++ b/config/saipdispconf.h
@@ -17,3 +17,4 @@
 #define CONFIG_MSM_SDE_ROTATOR 1
 #define CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG 1
 #define CONFIG_DRM_SDE_RSC 1
+#define CONFIG_DRM_DYNAMIC_REFRESH_RATE 1

From 2f1e2747642f542533ebab33df6e87a3820f425e Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Mon, 20 Jan 2020 14:47:47 +0800
Subject: [PATCH 48/94] Display PanelMode: Add CABC control

Add CABC control interface for video mode panel. This interface is
also used by sde connector property.

Change-Id: I0b3e57c3c9491a02df427b8e84869029cb2ebf53
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1485623
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Chuwei Xu <xucw@motorola.com>
Reviewed-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-by: Shi-Yong Li <a22381@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509831
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_defs.h      |  6 ++++++
 msm/dsi/dsi_panel.c     | 32 +++++++++++++++++++++++++++++++-
 msm/dsi/dsi_panel.h     |  7 +++++++
 msm/msm_drv.h           |  2 ++
 msm/sde/sde_connector.c | 10 ++++++++++
 msm/sde/sde_motUtil.c   |  6 ++++--
 6 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index f47ad8cb60ab..774e1ba9c86a 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -286,6 +286,9 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_HBM_OFF:                   Turning HBM off
  * @DSI_CMD_SET_ACL_ON:                    Turning ACL on
  * @DSI_CMD_SET_ACL_OFF:                   Turning ACL off
+ * @DSI_CMD_SET_CABC_UI:                   CABC UI mode
+ * @DSI_CMD_SET_CABC_MV:                   CABC MV mode
+ * @DSI_CMD_SET_CABC_DIS:                  CABC DIS mode
  * @DSI_CMD_SET_MAX
  */
 enum dsi_cmd_set_type {
@@ -317,6 +320,9 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_HBM_OFF,
 	DSI_CMD_SET_ACL_ON,
 	DSI_CMD_SET_ACL_OFF,
+	DSI_CMD_SET_CABC_UI,
+	DSI_CMD_SET_CABC_MV,
+	DSI_CMD_SET_CABC_DIS,
 	DSI_CMD_SET_MAX
 };
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index b876171f935f..a73ba73cec58 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -129,10 +129,18 @@ static struct panel_param_val_map acl_map[ACL_STATE_NUM] = {
 	{ACL_ON_STATE, DSI_CMD_SET_ACL_ON, NULL},
 };
 
+static struct panel_param_val_map cabc_map[CABC_STATE_NUM] = {
+	{CABC_UI_STATE, DSI_CMD_SET_CABC_UI, NULL},
+	{CABC_MV_STATE, DSI_CMD_SET_CABC_MV, NULL},
+	{CABC_DIS_STATE, DSI_CMD_SET_CABC_DIS, NULL},
+};
+
 static struct panel_param dsi_panel_param[PANEL_IDX_MAX][PARAM_ID_NUM] = {
 	{
 		{"HBM", hbm_map, HBM_STATE_NUM, HBM_OFF_STATE,
 				HBM_OFF_STATE, false},
+		{"CABC", cabc_map, CABC_STATE_NUM, CABC_UI_STATE,
+				CABC_UI_STATE, false},
 		{"ACL", acl_map, ACL_STATE_NUM, ACL_OFF_STATE,
 			ACL_OFF_STATE, false}
 	},
@@ -882,7 +890,7 @@ static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
 
         param_map = panel_param->val_map;
 
-	DSI_DEBUG("%s: param_name=%s; val_max =%d, default_value=%d, value=%d\n",
+	DSI_INFO("%s: param_name=%s; val_max =%d, default_value=%d, value=%d\n",
 	        __func__, panel_param->param_name, panel_param->val_max,
 		panel_param->default_value, panel_param->value);
 
@@ -982,6 +990,19 @@ static int dsi_panel_set_acl(struct dsi_panel *panel,
         return rc;
 };
 
+static int dsi_panel_set_cabc(struct dsi_panel *panel,
+                        struct msm_param_info *param_info)
+{
+	int rc = 0;
+
+	pr_info("%s: Set CABC to (%d)\n", __func__, param_info->value);
+	rc = dsi_panel_send_param_cmd(panel, param_info);
+	if (rc < 0)
+		pr_err("%s: failed to send param cmds. ret=%d\n", __func__, rc);
+
+        return rc;
+};
+
 int dsi_panel_set_param(struct dsi_panel *panel,
 				struct msm_param_info *param_info)
 {
@@ -998,6 +1019,9 @@ int dsi_panel_set_param(struct dsi_panel *panel,
 		case PARAM_HBM_ID :
 			dsi_panel_set_hbm(panel, param_info);
 			break;
+		case PARAM_CABC_ID :
+			dsi_panel_set_cabc(panel, param_info);
+			break;
 		case PARAM_ACL_ID :
 			dsi_panel_set_acl(panel, param_info);
 			break;
@@ -2095,6 +2119,9 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-hbm-off-command",
 	"qcom,mdss-dsi-acl-on-command",
 	"qcom,mdss-dsi-acl-off-command",
+	"qcom,mdss-dsi-cabc-ui-command",
+	"qcom,mdss-dsi-cabc-mv-command",
+	"qcom,mdss-dsi-cabc-dis-command",
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -2126,6 +2153,9 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-hbm-off-command-state",
 	"qcom,mdss-dsi-acl-on-command-state",
 	"qcom,mdss-dsi-acl-off-command-state",
+	"qcom,mdss-dsi-cabc-ui-command-state",
+	"qcom,mdss-dsi-cabc-mv-command-state",
+	"qcom,mdss-dsi-cabc-dis-command-state",
 };
 
 static int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 90cdf12f0fbd..1f48eb857389 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -195,6 +195,13 @@ enum hbm_state {
 	HBM_STATE_NUM
 };
 
+enum cabc_state {
+	CABC_UI_STATE,
+	CABC_MV_STATE,
+	CABC_DIS_STATE,
+	CABC_STATE_NUM,
+};
+
 struct panel_param_val_map {
 	int state;
 	enum dsi_cmd_set_type type;
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index cc0fc3754081..35be5521391d 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -205,6 +205,7 @@ enum msm_mdp_conn_property {
 
 	/* MOT feature panel*/
 	CONNECTOR_PROP_HBM,
+	CONNECTOR_PROP_CABC,
 	CONNECTOR_PROP_ACL,
 	/* total # of properties */
 	CONNECTOR_PROP_COUNT
@@ -324,6 +325,7 @@ enum msm_param_state {
 
 enum msm_param_id {
 	PARAM_HBM_ID = 0,
+	PARAM_CABC_ID,
 	PARAM_ACL_ID,
 	PARAM_ID_NUM
 };
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index f595405703e2..30df0e6bf416 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1506,6 +1506,14 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 		if (rc)
 			goto end;
 		break;
+	case CONNECTOR_PROP_CABC:
+		param_info.value = val;
+		param_info.param_idx = PARAM_CABC_ID;
+		param_info.param_conn_idx = CONNECTOR_PROP_CABC;
+		rc = _sde_connector_update_param(c_conn, &param_info);
+		if (rc)
+			goto end;
+		break;
 	default:
 		break;
 	}
@@ -2437,6 +2445,8 @@ static int sde_connector_install_panel_params(struct sde_connector *c_conn)
 
 		if (!strncmp(param_cmds->param_name, "HBM", 3))
 			prop_idx = CONNECTOR_PROP_HBM;
+		else if (!strncmp(param_cmds->param_name, "CABC", 4))
+			prop_idx = CONNECTOR_PROP_CABC;
 		else if (!strncmp(param_cmds->param_name, "ACL", 3))
 			prop_idx = CONNECTOR_PROP_ACL;
 		else {
diff --git a/msm/sde/sde_motUtil.c b/msm/sde/sde_motUtil.c
index d33f11222533..84ff35b4caee 100644
--- a/msm/sde/sde_motUtil.c
+++ b/msm/sde/sde_motUtil.c
@@ -214,10 +214,12 @@ static int _sde_debugfs_motUtil_kms_prop_test(struct sde_kms *kms,
 		case KMSPROPTEST_TYPE_HBM:
 			conn_prop_idx = CONNECTOR_PROP_HBM;
 			break;
-/*		case KMSPROPTEST_TYPE_ACL:
+		case KMSPROPTEST_TYPE_ACL:
 			conn_prop_idx = CONNECTOR_PROP_ACL;
 			break;
-*/
+		case KMSPROPTEST_TYPE_CABC:
+			conn_prop_idx = CONNECTOR_PROP_CABC;
+			break;
 		default:
 			DRM_ERROR(" Invalid KMSPROPTEST_PROP_INDEX = %d\n",
 						input[KMSPROPTEST_PROP_INDEX]);

From 56f1586746d1f90dcfa0244b69aa630cc9d6a839 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Mon, 20 Jan 2020 10:40:30 +0800
Subject: [PATCH 49/94] drm/panel_param: optimize the code

1.Different projects have different features.
For example: there are not "ACL" feature for lcd panel.
So some feature cmd parse is failed.
We only release the struct dsi_panel_cmd_set when parse failed.
2.Must get "panel_hbm_fod" first, then parse param property.

Change-Id: If7f4395af70fcc5a775a1178f742773b32ffeaaa
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1485550
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509832
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index a73ba73cec58..36b86274b13b 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3672,7 +3672,7 @@ end:
 }
 
 static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
-				struct device_node *of_node, u32 param_idx)
+				struct device_node *of_node, u32 panel_idx)
 {
 	int i, j, rc =0;
 	struct panel_param *param;
@@ -3682,8 +3682,11 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 	const char *prop;
 	struct dsi_parser_utils *utils = &panel->utils;
 
+	panel->panel_hbm_fod = of_property_read_bool(of_node,
+				"qcom,mdss-dsi-hbm-fod");
+
 	for (i = 0; i < PARAM_ID_NUM; i++) {
-		param = &dsi_panel_param[param_idx][i];
+		param = &dsi_panel_param[panel_idx][i];
 
 		if (!param) {
 			pr_err("Invalid param\n");
@@ -3716,16 +3719,24 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 			rc = dsi_panel_parse_cmd_sets_sub(param_map->cmds,
 							type, utils);
 			if (rc) {
-				DSI_ERR("panel param cmd %s parsing failed\n",
+				DSI_WARN("panel param cmd %s parsing failed\n",
 						param->param_name);
-				rc = -EINVAL;
-				goto parse_err;
+				break;
 			}
 		}
 
 		if (!rc) {
 			param->is_supported = true;
 			DSI_INFO("%s: feature enabled.\n", param->param_name);
+		} else {
+			param->is_supported = false;
+			pr_info("%s: feature disabled.\n", param->param_name);
+			for (j = 0; j < param->val_max; j++) {
+				if (param->val_map[j].cmds) {
+					kfree(param->val_map[j].cmds);
+					param->val_map[j].cmds= NULL;
+				}
+			}
 		}
 	}
 
@@ -3734,22 +3745,6 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 	if (panel->is_hbm_using_51_cmd)
 		DSI_INFO("HBM command is using 0x51 command\n");
 
-	panel->panel_hbm_fod = of_property_read_bool(of_node,
-				"qcom,mdss-dsi-hbm-fod");
-
-	return rc;
-
-parse_err:
-	for (i = 0; i < ARRAY_SIZE(dsi_panel_param); i++) {
-		param = &dsi_panel_param[param_idx][i];
-		for (j = 0; j < param->val_max; j++) {
-			if (param->val_map[j].cmds) {
-				kfree(param->val_map[j].cmds);
-				param->val_map[j].cmds= NULL;
-			}
-		}
-		param->is_supported = false;
-	}
 err:
 	return rc;
 
@@ -3851,7 +3846,7 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 	struct dsi_parser_utils *utils;
 	const char *panel_physical_type;
 	int rc = 0;
-	u32 param_idx = 0; /* Since only panel support for now */
+	u32 panel_idx = 0; /* Since only panel support for now */
 
 	panel = kzalloc(sizeof(*panel), GFP_KERNEL);
 	if (!panel)
@@ -3882,8 +3877,8 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 	if (rc)
 		DSI_DEBUG("failed to parse mot_panel_config, rc = %d\n", rc);
 
-	panel->param_cmds = dsi_panel_param[param_idx];
-	rc = dsi_panel_parse_param_prop(panel, of_node, param_idx );
+	panel->param_cmds = dsi_panel_param[panel_idx];
+	rc = dsi_panel_parse_param_prop(panel, of_node, panel_idx );
 	if (rc)
 		pr_debug("failed to parse panel param prop, rc =%d\n", rc);
 

From fc95d6e7a9c1c6f1f9d501dd68bdde794b235e7a Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Tue, 18 Feb 2020 10:09:45 +0800
Subject: [PATCH 50/94] dsi_panel: Check the return status of the touch screen

Touch have a feature named "single tap".
1. When the feature enbled, we can not power down panel,
    and keep rest signal high.
2. When the feature disabled, the retrun value is s 0,
    Instead, the retrun value is 1.

Change-Id: Ib4530ebcd3132d60588dbe92ab23d0737983b6b4
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1499390
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jun Weng <wengjun1@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1509833
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  8 ++++++++
 2 files changed, 52 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 36b86274b13b..ef0d9f0bd6f7 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -498,12 +498,44 @@ static int dsi_panel_set_pinctrl_state(struct dsi_panel *panel, bool enable)
 	return rc;
 }
 
+#if defined(CONFIG_PANEL_NOTIFICATIONS)
+static bool panel_power_is_alway_on(struct dsi_panel *panel)
+{
+	int touch_state = 0;
+	bool rc = 0;
+
+	struct dsi_display *dsi_display =
+		container_of(panel->host, struct dsi_display, host);
+
+	if (unlikely(dsi_display == NULL))
+		return rc;
+
+	if( check_touch_state(&touch_state, dsi_display->display_idx) == 0)
+	{
+		panel->tp_state = touch_state;
+		rc = touch_state ? 1: 0;
+	}
+
+	return rc;
+}
+#else
+static bool panel_power_is_alway_on(struct dsi_panel *panel)
+{
+	return 0;
+}
+#endif
 
 static int dsi_panel_power_on(struct dsi_panel *panel)
 {
 	int rc = 0;
 
 	DSI_INFO("(%s)+\n", panel->name);
+
+	if ((panel->tp_state_check_enable) && (panel->tp_state)) {
+		pr_info("%s: (%s)+power is alway on \n", __func__, panel->name);
+		goto exit;
+	}
+
 	rc = dsi_pwr_enable_regulator(&panel->power_info, true);
 	if (rc) {
 		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
@@ -531,6 +563,14 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 	int rc = 0;
 
 	DSI_INFO("(%s)+\n", panel->name);
+
+	if (panel->tp_state_check_enable) {
+			if (panel_power_is_alway_on (panel)) {
+			pr_info("%s: (%s)+power is alway on \n", __func__, panel->name);
+			goto exit;
+		}
+	}
+
 	if (gpio_is_valid(panel->reset_config.disp_en_gpio))
 		gpio_set_value(panel->reset_config.disp_en_gpio, 0);
 
@@ -559,6 +599,7 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
 				panel->name, rc);
 
+exit:
 	return rc;
 }
 static int dsi_panel_tx_cmd_set(struct dsi_panel *panel,
@@ -3778,6 +3819,9 @@ static int dsi_panel_parse_mot_panel_config(struct dsi_panel *panel,
 
 	panel->no_panel_on_read_support = of_property_read_bool(of_node,
 				"qcom,mdss-dsi-no-panel-on-read-support");
+
+	panel->tp_state_check_enable = of_property_read_bool(of_node,
+				"qcom,tp_state_check_enable");
 	return rc;
 }
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 1f48eb857389..82bc1962b53a 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -217,6 +217,11 @@ struct panel_param {
 	bool is_supported;
 };
 
+enum touch_state {
+	TOUCH_DEEP_SLEEP_STATE = 0,
+	TOUCH_LOW_POWER_STATE,
+};
+
 struct dsi_panel {
 	const char *name;
 	const char *type;
@@ -285,6 +290,9 @@ struct dsi_panel {
 	bool panel_hbm_fod;
 
 	struct panel_param *param_cmds;
+
+	enum touch_state tp_state;
+	bool tp_state_check_enable;
 };
 
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)

From 9ec15a8bea5bebe771e45fde8e7b35e17b1a3f2d Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Thu, 27 Feb 2020 14:01:18 +0800
Subject: [PATCH 51/94] msm/dsi: set brightness at maximum if enabling LCD HBM

For LCD panel, set brightness at maximum while entering HBM and keep it
same afterwards whatever user space brightness. Previous user space
brightness is restored while exiting HBM. This change ensures LCD and
OLED HBM behavior consistent.

Change-Id: I90548156ce276df1d89058eb9625900682253fc2
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1486238
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1510692
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 126 ++++++++++++++++++++++++++++++--------------
 msm/dsi/dsi_panel.h |  32 ++++++++++-
 2 files changed, 115 insertions(+), 43 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index ef0d9f0bd6f7..227b08f166f0 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -756,16 +756,6 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	else
 		rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);
 
-	if (panel->is_hbm_using_51_cmd) {
-		panel->bl_lvl_during_hbm = bl_lvl;
-
-		if (panel->is_hbm_on) {
-			DSI_DEBUG("HBM is on.. ignore setting backlight. bl_vl=%d\n",
-						panel->bl_lvl_during_hbm);
-			return 0;
-		}
-	}
-
 	if (bl->bl_2bytes_enable)
 		rc = mipi_dsi_dcs_set_display_brightness_2bytes(dsi, bl_lvl);
 	else
@@ -828,6 +818,60 @@ error:
 	return rc;
 }
 
+static bool dsi_panel_param_is_supported(u32 param_idx)
+{
+
+	struct panel_param *param = NULL;
+
+	param = &dsi_panel_param[0][param_idx];
+
+	if (param_idx < PARAM_ID_NUM && param && param->is_supported)
+		return true;
+	return false;
+}
+
+static bool dsi_panel_param_is_hbm_on(struct dsi_panel *panel)
+{
+	struct panel_param *panel_param;
+
+	panel_param = &dsi_panel_param[0][PARAM_HBM_ID];
+	if (!panel_param) {
+		pr_err("%s: invalid panel_param.\n", __func__);
+		return false;
+	}
+
+	if(panel_param->is_supported && panel_param->value != HBM_OFF_STATE)
+		return true;
+
+	return false;
+}
+
+static bool dsi_panel_set_hbm_backlight(struct dsi_panel *panel, u32 *bl_lvl)
+{
+	u32 bl_level;
+
+	if (!dsi_panel_param_is_supported(PARAM_HBM_ID))
+		return false;
+
+	bl_level = *bl_lvl;
+
+	if (bl_level == BRIGHTNESS_HBM_ON && panel->hbm_type == HBM_TYPE_OLED) {
+		return true;
+	} else if (bl_level == BRIGHTNESS_HBM_ON || bl_level == BRIGHTNESS_HBM_OFF) {
+		*bl_lvl = bl_level == BRIGHTNESS_HBM_ON ?
+			panel->bl_config.bl_max_level : panel->bl_lvl_during_hbm;
+		return false;
+	} else {
+		panel->bl_lvl_during_hbm = bl_level;
+		if (dsi_panel_param_is_hbm_on(panel)) {
+			DSI_INFO("HBM is on.. ignore setting backlight. bl_vl=%d\n",
+				panel->bl_lvl_during_hbm);
+			return true;
+		}
+	}
+	return false;
+}
+
 int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 {
 	int rc = 0;
@@ -836,6 +880,9 @@ int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 	if (panel->host_config.ext_bridge_mode)
 		return 0;
 
+	if (dsi_panel_set_hbm_backlight(panel, &bl_lvl))
+		return 0;
+
 	DSI_DEBUG("backlight type:%d lvl:%d\n", bl->type, bl_lvl);
 	switch (bl->type) {
 	case DSI_BACKLIGHT_WLED:
@@ -984,38 +1031,19 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
                         struct msm_param_info *param_info)
 {
 	int rc = 0;
-	u32 tmp_bklt_lvl = 0;
-	bool old_hbm_on;
 
 	pr_info("Set HBM to (%d)\n", param_info->value);
+
 	rc = dsi_panel_send_param_cmd(panel, param_info);
-	if (rc < 0)
+	if (rc < 0) {
 		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
-	else {
-		mutex_lock(&panel->panel_lock);
-		if (!panel->is_hbm_using_51_cmd) {
-			mutex_unlock(&panel->panel_lock);
-			return rc;
-		}
-
-		old_hbm_on = panel->is_hbm_on ;
-		panel->is_hbm_on = param_info->value;
-		if (!panel->is_hbm_on) {
-			tmp_bklt_lvl= panel->bl_lvl_during_hbm;
-			panel->bl_lvl_during_hbm = 0;
-		}
-		mutex_unlock(&panel->panel_lock);
-
-		if (param_info->value == 0 && old_hbm_on && tmp_bklt_lvl) {
-			rc = dsi_panel_set_backlight(panel, tmp_bklt_lvl);
-			if (rc)
-				DSI_ERR("unable to set backlight\n");
-			else
-				tmp_bklt_lvl = 0;
-		}
+	} else {
+		rc = dsi_panel_set_backlight(panel, HBM_BRIGHTNESS(param_info->value));
+		if (rc)
+			DSI_ERR("unable to set backlight\n");
 	}
 
-        return rc;
+	return rc;
 };
 
 static int dsi_panel_set_acl(struct dsi_panel *panel,
@@ -3722,6 +3750,7 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 	enum dsi_cmd_set_type type;
 	const char *prop;
 	struct dsi_parser_utils *utils = &panel->utils;
+	const char *data;
 
 	panel->panel_hbm_fod = of_property_read_bool(of_node,
 				"qcom,mdss-dsi-hbm-fod");
@@ -3734,6 +3763,26 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 			goto err;
 		}
 
+		if (i == PARAM_HBM_ID){
+			panel->panel_hbm_fod = of_property_read_bool(of_node,
+				"qcom,mdss-dsi-hbm-fod");
+
+			data = of_get_property(of_node, "qcom,mdss-dsi-hbm-type", NULL);
+			if (data && !strcmp(data, "lcd-dcs-wled"))
+				panel->hbm_type = HBM_TYPE_LCD_DCS_WLED;
+			else if (data && !strcmp(data, "lcd-dcs-only"))
+				panel->hbm_type = HBM_TYPE_LCD_DCS_ONLY;
+			else if (data && !strcmp(data, "lcd-wled-only"))
+				panel->hbm_type = HBM_TYPE_LCD_WLED_ONLY;
+			else if (data && !strcmp(data, "lcd-dcs-gpio"))
+				panel->hbm_type = HBM_TYPE_LCD_DCS_GPIO;
+			else
+				panel->hbm_type = HBM_TYPE_OLED;
+
+			panel->bl_lvl_during_hbm = panel->bl_config.bl_max_level;
+
+		}
+
 		rc = -EINVAL;
 		for (j = 0; j < param->val_max && param->val_max > 0 ; j++) {
 			param_map = &param->val_map[j];
@@ -3781,11 +3830,6 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 		}
 	}
 
-	panel->is_hbm_using_51_cmd = of_property_read_bool(of_node,
-				"qcom,mdss-dsi-panel-hbm-is-51cmd");
-	if (panel->is_hbm_using_51_cmd)
-		DSI_INFO("HBM command is using 0x51 command\n");
-
 err:
 	return rc;
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 82bc1962b53a..1e07beee2ab2 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -38,6 +38,35 @@
 #define DSI_PANEL_MAX_PANEL_LEN        128
 #define MAX_PARAM_NAME 10
 
+#define BRIGHTNESS_HBM_ON	0xFFFFFFFE
+#define BRIGHTNESS_HBM_OFF	(BRIGHTNESS_HBM_ON - 1)
+#define HBM_BRIGHTNESS(value) ((value) == HBM_ON_STATE ?\
+			BRIGHTNESS_HBM_ON : BRIGHTNESS_HBM_OFF)
+
+/* HBM implementation is different, depending on display and backlight hardware
+ * design, which is classified into the following types:
+ * HBM_TYPE_OLED: OLED panel, HBM is controlled by DSI register only, which
+ *     is independent on brightness.
+ * HBM_TYPE_LCD_DCS_WLED: LCD panel, HBM is controlled by DSI register, and
+ *     brightness is decided by WLED IC on I2C/SPI bus.
+ * HBM_TYPE_LCD_DCS_ONLY: LCD panel, brightness/HBM is controlled by DSI
+ *     register only.
+ * HBM_TYPE_LCD_WLED_ONLY: LCD panel, brightness/HBM is controlled by WLED
+ *     IC only.
+ * HBM_TYPE_LCD_DCS_GPIO: LCD panel, HBM  is controlled by GPIO, and brightness
+ *     is controlled by DSI register.
+ *
+ * Note: brightness must be at maximum while enabling HBM for all LCD panels
+ */
+
+enum panel_hbm_type {
+	HBM_TYPE_OLED = 0,
+	HBM_TYPE_LCD_DCS_WLED,
+	HBM_TYPE_LCD_DCS_ONLY,
+	HBM_TYPE_LCD_WLED_ONLY,
+	HBM_TYPE_LCD_DCS_GPIO
+};
+
 enum dsi_panel_rotation {
 	DSI_PANEL_ROTATE_NONE = 0,
 	DSI_PANEL_ROTATE_HV_FLIP,
@@ -284,8 +313,7 @@ struct dsi_panel {
 	u32 disp_on_chk_val;
 	bool no_panel_on_read_support;
 
-	bool is_hbm_using_51_cmd;
-	bool is_hbm_on;
+	enum panel_hbm_type hbm_type;
 	u32  bl_lvl_during_hbm;
 	bool panel_hbm_fod;
 

From 7b6a915c9909fc53bef447e943d200ed613eea89 Mon Sep 17 00:00:00 2001
From: daiss1 <daiss1@lenovo.com>
Date: Fri, 6 Mar 2020 17:52:09 +0800
Subject: [PATCH 52/94] msm/dsi: add backlight and hbm debug log

Modify:
add backlight and hbm debug log

Change-Id: I900457c2f233a1e2d6d2b6077427171e05b3787c
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1508369
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1510693
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_panel.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 227b08f166f0..30096d05a8e4 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -856,10 +856,14 @@ static bool dsi_panel_set_hbm_backlight(struct dsi_panel *panel, u32 *bl_lvl)
 	bl_level = *bl_lvl;
 
 	if (bl_level == BRIGHTNESS_HBM_ON && panel->hbm_type == HBM_TYPE_OLED) {
+		DSI_INFO("OLED HBM is on.. ignore setting backlight. bl_level=%d\n",
+				bl_level);
 		return true;
 	} else if (bl_level == BRIGHTNESS_HBM_ON || bl_level == BRIGHTNESS_HBM_OFF) {
 		*bl_lvl = bl_level == BRIGHTNESS_HBM_ON ?
 			panel->bl_config.bl_max_level : panel->bl_lvl_during_hbm;
+		DSI_INFO("HBM set  bl_level=%d bl_max_level = %d bl_lvl_during_hbm = %d\n",
+				bl_level, panel->bl_config.bl_max_level, panel->bl_lvl_during_hbm);
 		return false;
 	} else {
 		panel->bl_lvl_during_hbm = bl_level;
@@ -883,7 +887,7 @@ int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 	if (dsi_panel_set_hbm_backlight(panel, &bl_lvl))
 		return 0;
 
-	DSI_DEBUG("backlight type:%d lvl:%d\n", bl->type, bl_lvl);
+	DSI_INFO("backlight type:%d lvl:%d\n", bl->type, bl_lvl);
 	switch (bl->type) {
 	case DSI_BACKLIGHT_WLED:
 		rc = backlight_device_set_brightness(bl->raw_bd, bl_lvl);

From 313376a3ab31d4d6784dd44c4e8b34c19739d339 Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@lenovo.com>
Date: Fri, 1 May 2020 06:42:07 +0800
Subject: [PATCH 53/94] backlight: add hbm gpio control driver

add hbm gpio control driver

Change-Id: I5f77916e54b8985a352f963ae7ae20b51d73d7e8
Reviewed-on: https://gerrit.mot.com/1546190
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 53 +++++++++++++++++++++++++++++++++++++++------
 msm/dsi/dsi_panel.h |  2 +-
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 30096d05a8e4..34df21c8d774 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -335,6 +335,15 @@ static int dsi_panel_gpio_request(struct dsi_panel *panel)
 		}
 	}
 
+	if (gpio_is_valid(panel->hbm_en_gpio)) {
+		rc = gpio_request(panel->hbm_en_gpio, "panel_hbm_gpio");
+		if (rc) {
+			DSI_ERR("request for panel_hbm_gpio failed, rc=%d\n",
+				 rc);
+			goto error_release_hbm_en;
+		}
+	}
+
 	if (gpio_is_valid(panel->panel_test_gpio)) {
 		rc = gpio_request(panel->panel_test_gpio, "panel_test_gpio");
 		if (rc) {
@@ -346,6 +355,9 @@ static int dsi_panel_gpio_request(struct dsi_panel *panel)
 	}
 
 	goto error;
+error_release_hbm_en:
+	if (gpio_is_valid(r_config->lcd_mode_sel_gpio))
+		gpio_free(r_config->lcd_mode_sel_gpio);
 error_release_mode_sel:
 	if (gpio_is_valid(panel->bl_config.en_gpio))
 		gpio_free(panel->bl_config.en_gpio);
@@ -379,6 +391,9 @@ static int dsi_panel_gpio_release(struct dsi_panel *panel)
 	if (gpio_is_valid(panel->panel_test_gpio))
 		gpio_free(panel->panel_test_gpio);
 
+	if (gpio_is_valid(panel->hbm_en_gpio))
+		gpio_free(panel->hbm_en_gpio);
+
 	return rc;
 }
 
@@ -1038,15 +1053,30 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 
 	pr_info("Set HBM to (%d)\n", param_info->value);
 
-	rc = dsi_panel_send_param_cmd(panel, param_info);
-	if (rc < 0) {
-		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
-	} else {
-		rc = dsi_panel_set_backlight(panel, HBM_BRIGHTNESS(param_info->value));
-		if (rc)
+	if (panel->hbm_type == HBM_TYPE_LCD_DCS_GPIO) {
+		if (gpio_is_valid(panel->hbm_en_gpio)) {
+			if (param_info->value) {
+				gpio_direction_output(panel->hbm_en_gpio, 1);
+				pr_info("Set HBM to (%d) with GPIO%d\n", param_info->value, panel->hbm_en_gpio);
+			}
+			else {
+				gpio_direction_output(panel->hbm_en_gpio, 0);
+				pr_info("Set HBM to (%d) with GPIO%d\n", param_info->value, panel->hbm_en_gpio);
+			}
+			} else {
+				DSI_ERR("%s: invalid params\n", __func__);
+				rc = -EINVAL;
+			}
+		} else {
+		rc = dsi_panel_send_param_cmd(panel, param_info);
+		if (rc < 0) {
+			DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
+		} else {
+			rc = dsi_panel_set_backlight(panel, HBM_BRIGHTNESS(param_info->value));
+			if (rc)
 			DSI_ERR("unable to set backlight\n");
+		}
 	}
-
 	return rc;
 };
 
@@ -2683,6 +2713,15 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel)
 		DSI_DEBUG("%s:%d panel test gpio not specified\n", __func__,
 			 __LINE__);
 
+	panel->hbm_en_gpio = utils->get_named_gpio(utils->data,
+					      "qcom,platform-hbm-en-gpio", 0);
+	if (!gpio_is_valid(panel->hbm_en_gpio))
+		DSI_ERR("%s:%d, HBM enable gpio not specified\n",
+						__func__, __LINE__);
+
+	DSI_ERR("%s:%d, HBM enable gpio not specified, gpio%d\n",
+					__func__, __LINE__, panel->hbm_en_gpio);
+
 error:
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 1e07beee2ab2..868a4403ffbb 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -316,7 +316,7 @@ struct dsi_panel {
 	enum panel_hbm_type hbm_type;
 	u32  bl_lvl_during_hbm;
 	bool panel_hbm_fod;
-
+	int hbm_en_gpio;
 	struct panel_param *param_cmds;
 
 	enum touch_state tp_state;

From 174d801415ec640ba389e983d60116872c358c9b Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@lenovo.com>
Date: Wed, 13 May 2020 11:55:49 +0800
Subject: [PATCH 54/94] backlight: support device hbm use 51 cmd

Guam/Guamp hbm use dcs cmd only, which combined with brightness
cmd, hbm send the 51 cmd, and no need to set brightness again.

Change-Id: Iee8f850bd5856210ec171f203ef7de2685fc3f5c
Signed-off-by: tanhua1 <tanhua1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1553084
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 12 +++++++++++-
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 34df21c8d774..2ee72a78db45 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -879,7 +879,10 @@ static bool dsi_panel_set_hbm_backlight(struct dsi_panel *panel, u32 *bl_lvl)
 			panel->bl_config.bl_max_level : panel->bl_lvl_during_hbm;
 		DSI_INFO("HBM set  bl_level=%d bl_max_level = %d bl_lvl_during_hbm = %d\n",
 				bl_level, panel->bl_config.bl_max_level, panel->bl_lvl_during_hbm);
-		return false;
+		if(panel->is_hbm_using_51_cmd && dsi_panel_param_is_hbm_on(panel))
+			return true;
+		else
+			return false;
 	} else {
 		panel->bl_lvl_during_hbm = bl_level;
 		if (dsi_panel_param_is_hbm_on(panel)) {
@@ -1027,6 +1030,9 @@ static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
 		if (param_map_state->cmds->state == DSI_CMD_SET_STATE_LP)
 			cmds->msg.flags |= MIPI_DSI_MSG_USE_LPM |
 						MIPI_DSI_MSG_LASTCOMMAND;
+		if (cmds->last_command)
+			cmds->msg.flags |= MIPI_DSI_MSG_LASTCOMMAND;
+
 		len = ops->transfer(panel->host, &cmds->msg);
 		if (len < 0) {
 			rc = len;
@@ -3824,6 +3830,10 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 
 			panel->bl_lvl_during_hbm = panel->bl_config.bl_max_level;
 
+			panel->is_hbm_using_51_cmd = of_property_read_bool(of_node,
+						"qcom,mdss-dsi-panel-hbm-is-51cmd");
+			if (panel->is_hbm_using_51_cmd)
+				DSI_INFO("HBM command is using 0x51 command\n");
 		}
 
 		rc = -EINVAL;
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 868a4403ffbb..5b5294b61e00 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -317,6 +317,7 @@ struct dsi_panel {
 	u32  bl_lvl_during_hbm;
 	bool panel_hbm_fod;
 	int hbm_en_gpio;
+	bool is_hbm_using_51_cmd;
 	struct panel_param *param_cmds;
 
 	enum touch_state tp_state;

From f724804d4799d18d0dea76f806777d7fdbc27d97 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Tue, 26 May 2020 16:14:15 +0800
Subject: [PATCH 55/94] dsi_panel: fix out-of-bounds  issue

Before make the read operation, malloc the space of rx_buf.
To avoid the out-of-bounds  issue.

Change-Id: I6841d230af04b9a57b7281d8edc2e367e7f0ceab
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1583906
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 2ee72a78db45..575c5eb519ea 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3929,6 +3929,7 @@ static int dsi_panel_get_pwr_mode(struct dsi_panel *panel, u8 *val)
 	struct dsi_display *display = NULL;
 	u32 flags;
 	u8 payload = MIPI_DCS_GET_POWER_MODE;
+	u32 rx_buf;
 
 	display = container_of(panel->host, struct dsi_display, host);
 	if (!display) {
@@ -3948,7 +3949,7 @@ static int dsi_panel_get_pwr_mode(struct dsi_panel *panel, u8 *val)
 	cmd.msg.tx_len = 1;
 	cmd.msg.tx_buf = &payload;
 	cmd.msg.rx_len = 1;
-	cmd.msg.rx_buf = val;
+	cmd.msg.rx_buf = &rx_buf;
 
 	rc = dsi_display_cmd_mipi_transfer(display, &cmd.msg, flags);
 	if (rc <= 0) {
@@ -3956,6 +3957,8 @@ static int dsi_panel_get_pwr_mode(struct dsi_panel *panel, u8 *val)
 		rc = -EIO;
 	} else
 		rc = 0;
+
+	*val = rx_buf & 0xFF;
 end:
 	return rc;
 

From 12558560dec69e11f39786059cf3c55d5d1d5ceb Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Fri, 10 Jan 2020 08:25:41 -0600
Subject: [PATCH 56/94] disp: msm: Parsing and store panel's 0xDA register info

Since ALS sensor's Firmware needs to keep track the PWM duty cycle of
each panels' version, therefore the panels' register 0xDA will be used
to identify the PWM duty cycle programmed in each panels' version.
The new /sys/class/drm/card0-DSI1/panelRegDA sysfs will be created,
and it will show the panel's 0XDA reg information.

Change-Id: Idfc4d7201351233c30e6a6f81776dcbc87f245ee
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1514791
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1582086
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c   | 1 +
 msm/dsi/dsi_panel.c     | 1 +
 msm/dsi/dsi_panel.h     | 1 +
 msm/msm_drv.h           | 2 ++
 msm/sde/sde_connector.c | 1 +
 5 files changed, 6 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 53589718b956..994a570feef4 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6378,6 +6378,7 @@ int dsi_display_get_info(struct drm_connector *connector,
 
 	info->panel_id = display->panel->panel_id;
 	info->panel_ver = display->panel->panel_ver;
+	info->panel_regDA = display->panel->panel_regDA;
 	strncpy(info->panel_name, display->panel->panel_name,
 				sizeof(display->panel->panel_name));
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 575c5eb519ea..5ea326182dd6 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1866,6 +1866,7 @@ int dsi_panel_parse_panel_cfg(struct dsi_panel *panel, bool is_primary)
 	DSI_DEBUG("esd_utage_enable=%d\n", panel->esd_utag_enable);
 
 	panel_ver = (u32)panel->panel_ver;
+	panel->panel_regDA = (u32)panel->panel_ver & 0xff;
 	DSI_INFO("BL: panel(%s) =%s, panel_id =0x%016llx  panel_ver=0x%016llx\n",
 			is_primary? "primary": "secondary",
 			panel->panel_name, panel->panel_id, panel->panel_ver);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 5b5294b61e00..94a35d0ba5e0 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -308,6 +308,7 @@ struct dsi_panel {
 	bool esd_utag_enable;
 	u64 panel_id;
 	u64 panel_ver;
+	u32 panel_regDA;
 	char panel_name[DSI_PANEL_MAX_PANEL_LEN];
 
 	u32 disp_on_chk_val;
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 35be5521391d..721fabb364cc 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -529,6 +529,7 @@ struct msm_resource_caps_info {
  * @is_connected:       Set to true if display is connected
  * @panel_id
  * @panel_ver
+ * @panel_regDA
  * @panel_name[MSM_DISP_NAME_LEN_MAX];
  * @width_mm:           Physical width
  * @height_mm:          Physical height
@@ -556,6 +557,7 @@ struct msm_display_info {
 
 	uint64_t panel_id;
 	uint64_t panel_ver;
+	uint32_t panel_regDA;
 	char panel_name[MSM_DISP_NAME_LEN_MAX];
 
 	unsigned int width_mm;
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 30df0e6bf416..3c9a512d4726 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -2028,6 +2028,7 @@ static int sde_connector_get_panel_vendor_info(struct drm_connector *connector)
 	sde_connector_get_info(connector, &info);
 	connector->display_info.panel_id = info.panel_id;
 	connector->display_info.panel_ver = info.panel_ver;
+	connector->display_info.panel_regDA = info.panel_regDA;
 	strncpy(connector->display_info.panel_name, info.panel_name,
 					sizeof(info.panel_name));
 

From 75a2ceffd5211c13f36ea6a4562e9e952d2d9301 Mon Sep 17 00:00:00 2001
From: zhanggb <zhanggb@motorola.com>
Date: Thu, 23 Apr 2020 18:38:59 +0800
Subject: [PATCH 57/94] Kernel: read panel supplier from device tree

Moto hardware revision need panel supplier info. Add code to read
panel supplier from dtsi file.

Change-Id: I460c9a93b582394ef0e4c0e613943ff44a6774b8
Reviewed-on: https://gerrit.mot.com/1540967
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1582087
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Reviewed-by: Hua Tan <tanhua1@motorola.com>
---
 msm/dsi/dsi_display.c   |  2 ++
 msm/dsi/dsi_panel.c     | 10 ++++++++++
 msm/dsi/dsi_panel.h     |  1 +
 msm/msm_drv.h           |  1 +
 msm/sde/sde_connector.c |  2 ++
 5 files changed, 16 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 994a570feef4..b1ef3231d250 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6381,6 +6381,8 @@ int dsi_display_get_info(struct drm_connector *connector,
 	info->panel_regDA = display->panel->panel_regDA;
 	strncpy(info->panel_name, display->panel->panel_name,
 				sizeof(display->panel->panel_name));
+	strncpy(info->panel_supplier, display->panel->panel_supplier,
+				sizeof(display->panel->panel_supplier));
 
 	switch (display->panel->panel_mode) {
 	case DSI_OP_VIDEO_MODE:
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 5ea326182dd6..4e7b69a70140 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3992,6 +3992,7 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 	const char *panel_physical_type;
 	int rc = 0;
 	u32 panel_idx = 0; /* Since only panel support for now */
+	const char *pname;
 
 	panel = kzalloc(sizeof(*panel), GFP_KERNEL);
 	if (!panel)
@@ -4009,6 +4010,15 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 	if (!panel->name)
 		panel->name = DSI_PANEL_DEFAULT_LABEL;
 
+	pname = utils->get_property(utils->data,
+				"qcom,mdss-dsi-panel-supplier", NULL);
+	if (!pname || strlen(pname) == 0) {
+		DSI_WARN("Failed to get qcom,mdss-dsi-panel-supplier\n");
+		strlcpy(panel->panel_supplier, DSI_PANEL_UNKNOWN_PANEL_NAME,
+				sizeof(panel->panel_supplier));
+	} else
+		strlcpy(panel->panel_supplier, pname, sizeof(panel->panel_supplier));
+
 	/*
 	 * Set panel type to LCD as default.
 	 */
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 94a35d0ba5e0..631123a1071f 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -310,6 +310,7 @@ struct dsi_panel {
 	u64 panel_ver;
 	u32 panel_regDA;
 	char panel_name[DSI_PANEL_MAX_PANEL_LEN];
+	char panel_supplier[DSI_PANEL_MAX_PANEL_LEN];
 
 	u32 disp_on_chk_val;
 	bool no_panel_on_read_support;
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 721fabb364cc..bb85abf8b1b7 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -559,6 +559,7 @@ struct msm_display_info {
 	uint64_t panel_ver;
 	uint32_t panel_regDA;
 	char panel_name[MSM_DISP_NAME_LEN_MAX];
+	char panel_supplier[MSM_DISP_NAME_LEN_MAX];
 
 	unsigned int width_mm;
 	unsigned int height_mm;
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 3c9a512d4726..a471333b3293 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -2031,6 +2031,8 @@ static int sde_connector_get_panel_vendor_info(struct drm_connector *connector)
 	connector->display_info.panel_regDA = info.panel_regDA;
 	strncpy(connector->display_info.panel_name, info.panel_name,
 					sizeof(info.panel_name));
+	strncpy(connector->display_info.panel_supplier, info.panel_supplier,
+					sizeof(info.panel_supplier));
 
 	return 0;
 }

From 8a85c98dcf840a060db6c51d071ad6cd1308d2be Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@lenovo.com>
Date: Wed, 27 May 2020 16:21:25 +0800
Subject: [PATCH 58/94] drm/msm/sde: limit the backlight min brightness as
 bl_min_level

High-precision brightness will set the brightness level from bl_min_level to
bl_max_level. If we enable 12bit brightness, in fact, the hardware will not
tolerate very low brightness such as level '1 - 9' in liberty, these levels
cause the backlight unstable.
So we have to define the minimum brightness by 'qcom,mdss-dsi-bl-min-level'
that the driver does not set the backlight level below that.

Change-Id: I0c1c76b959e33c2eaa551cd30875e05e983e5ecb
Signed-off-by: tanhua1 <tanhua1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1583985
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/sde/sde_connector.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index a471333b3293..ee47ecab9170 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -88,6 +88,9 @@ static int sde_backlight_device_update_status(struct backlight_device *bd)
 	if (brightness > display->panel->bl_config.bl_max_level)
 		brightness = display->panel->bl_config.bl_max_level;
 
+	if(brightness && brightness < display->panel->bl_config.bl_min_level)
+		brightness = display->panel->bl_config.bl_min_level;
+
 	/* map UI brightness into driver backlight level with rounding */
 	bl_lvl = mult_frac(brightness, display->panel->bl_config.bl_max_level,
 			display->panel->bl_config.brightness_max_level);

From ed6ef5cfb4a74033697014280d752af423b83b23 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Mon, 15 Jun 2020 17:42:36 +0800
Subject: [PATCH 59/94] dsi: add new backlight control type I2C

dsi:
Add new backlight I2C.
Can't use WLED type, because WLED type don't consider if backlight
device is inited later then panel.

Change-Id: I1dcb4e10eaaecca8da4d44e384b1e49fb351693c
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1621694
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Reviewed-by: Jing Hu <hujing3@lenovo.com>
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 16 ++++++++++++++++
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 17 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 4e7b69a70140..6b9c42e3afb3 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -921,6 +921,12 @@ int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 	case DSI_BACKLIGHT_PWM:
 		rc = dsi_panel_update_pwm_backlight(panel, bl_lvl);
 		break;
+	case DSI_BACKLIGHT_I2C:
+		if (!(bl->raw_bd))
+			bl->raw_bd = backlight_device_get_by_type(BACKLIGHT_RAW);
+		else
+			rc = backlight_device_set_brightness(bl->raw_bd, bl_lvl);
+		break;
 	default:
 		DSI_ERR("Backlight type(%d) not supported\n", bl->type);
 		rc = -ENOTSUPP;
@@ -943,6 +949,10 @@ static u32 dsi_panel_get_brightness(struct dsi_backlight_config *bl)
 		if (bd->ops && bd->ops->get_brightness)
 			cur_bl_level = bd->ops->get_brightness(bd);
 		break;
+	case DSI_BACKLIGHT_I2C:
+		if (bd && bd->ops && bd->ops->get_brightness)
+			cur_bl_level = bd->ops->get_brightness(bd);
+		break;
 	case DSI_BACKLIGHT_DCS:
 	case DSI_BACKLIGHT_EXTERNAL:
 	case DSI_BACKLIGHT_PWM:
@@ -1168,6 +1178,8 @@ static int dsi_panel_bl_register(struct dsi_panel *panel)
 		break;
 	case DSI_BACKLIGHT_DCS:
 		break;
+	case DSI_BACKLIGHT_I2C:
+		break;
 	case DSI_BACKLIGHT_DUMMY:
 		break;
 	case DSI_BACKLIGHT_EXTERNAL:
@@ -1205,6 +1217,8 @@ static int dsi_panel_bl_unregister(struct dsi_panel *panel)
 		break;
 	case DSI_BACKLIGHT_DCS:
 		break;
+	case DSI_BACKLIGHT_I2C:
+		break;
 	case DSI_BACKLIGHT_DUMMY:
 		break;
 	case DSI_BACKLIGHT_EXTERNAL:
@@ -2779,6 +2793,8 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 		panel->bl_config.type = DSI_BACKLIGHT_DUMMY;
 	} else if (!strcmp(bl_type, "bl_ctrl_external")) {
 		panel->bl_config.type = DSI_BACKLIGHT_EXTERNAL;
+	} else if (!strcmp(bl_type, "bl_ctrl_i2c")) {
+		panel->bl_config.type = DSI_BACKLIGHT_I2C;
 	} else {
 		DSI_DEBUG("[%s] bl-pmic-control-type unknown-%s\n",
 			 panel->name, bl_type);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 631123a1071f..677f203e0f3f 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -80,6 +80,7 @@ enum dsi_backlight_type {
 	DSI_BACKLIGHT_DCS,
 	DSI_BACKLIGHT_DUMMY,
 	DSI_BACKLIGHT_EXTERNAL,
+	DSI_BACKLIGHT_I2C,
 	DSI_BACKLIGHT_UNKNOWN,
 	DSI_BACKLIGHT_MAX,
 };

From a1ef06c9872b3a473c9b9832704bdc239fdd0583 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Sun, 28 Jun 2020 21:41:25 +0800
Subject: [PATCH 60/94] kernel: dsi: pull down reset pin when shutdown

kernel/dsi:
Pull down reset pin when system shutdown.

Change-Id: Ibad88c056f683aa7f45746a0fa09d72c9826a22a
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1648436
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jing Hu <hujing3@lenovo.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 15 +++++++++++++++
 msm/dsi/dsi_panel.c   |  3 ++-
 msm/dsi/dsi_panel.h   |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index b1ef3231d250..194510fdd18e 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5581,6 +5581,20 @@ static void dsi_display_unbind(struct device *dev,
 	mutex_unlock(&display->display_lock);
 }
 
+static void dsi_display_dev_shutdown(struct platform_device *pdev)
+{
+	struct dsi_display *display = NULL;
+
+	if (!pdev) {
+		DSI_ERR("Invalid device\n");
+	} else {
+		display = platform_get_drvdata(pdev);
+		display->panel->reset_config.reset_force_pull_low =
+			display->panel->utils.read_bool(display->panel->utils.data,
+			"qcom,mdss-dsi-reset-force-pull-low");
+	}
+}
+
 static const struct component_ops dsi_display_comp_ops = {
 	.bind = dsi_display_bind,
 	.unbind = dsi_display_unbind,
@@ -5589,6 +5603,7 @@ static const struct component_ops dsi_display_comp_ops = {
 static struct platform_driver dsi_display_driver = {
 	.probe = dsi_display_dev_probe,
 	.remove = dsi_display_dev_remove,
+	.shutdown = dsi_display_dev_shutdown,
 	.driver = {
 		.name = "msm-dsi-display",
 		.of_match_table = dsi_display_dt_match,
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 6b9c42e3afb3..e2f01f7cec81 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -590,7 +590,8 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 		gpio_set_value(panel->reset_config.disp_en_gpio, 0);
 
 	if (gpio_is_valid(panel->reset_config.reset_gpio) &&
-					!panel->reset_gpio_always_on)
+					!panel->reset_gpio_always_on
+			&& panel->reset_config.reset_force_pull_low)
 		gpio_set_value(panel->reset_config.reset_gpio, 0);
 
 	if (gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 677f203e0f3f..7ea4313fa04a 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -183,6 +183,8 @@ struct dsi_panel_reset_config {
 	int disp_en_gpio;
 	int lcd_mode_sel_gpio;
 	u32 mode_sel_state;
+
+	bool reset_force_pull_low;
 };
 
 enum esd_check_status_mode {

From aa36d728198ef7d953d5000e8fe4910c9c1dd7e2 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Wed, 24 Jun 2020 16:25:57 +0800
Subject: [PATCH 61/94] msm/dsi: add panel tp rst configs

dsi:
add panel tp rst configs
to support tp rst & lcd rst power sequences per panel

Change-Id: I7bf17361fa18abb9de9fcb601e9ac39b75dd844c
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1648198
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 66 +++++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  4 +++
 2 files changed, 70 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index e2f01f7cec81..08fdc5642bd4 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -446,7 +446,24 @@ int dsi_panel_reset(struct dsi_panel *panel)
 		}
 	}
 
+	if (r_config->panel_on_tp_rst_enable && gpio_is_valid(r_config->tp_rst_gpio)) {
+		rc = gpio_request(r_config->tp_rst_gpio, "tp_rst_gpio");
+		if (rc) {
+			DSI_ERR("request for tp_rst_gpio failed, rc=%d\n", rc);
+		}
+	}
+
 	for (i = 0; i < r_config->count; i++) {
+		/* set tp rst before lcd rst */
+		if (r_config->panel_on_tp_rst_enable && gpio_is_valid(r_config->tp_rst_gpio)) {
+			DSI_DEBUG("dsp dbg: set tp_rst_gpio to %d\n", r_config->sequence[i].level);
+			gpio_set_value(r_config->tp_rst_gpio, r_config->sequence[i].level);
+
+			if (r_config->tp_rst_post_sleep && r_config->tp_rst_post_sleep < 200) {
+				usleep_range(r_config->tp_rst_post_sleep*1000, (r_config->tp_rst_post_sleep*1000 + 10));
+			}
+		}
+
 		gpio_set_value(r_config->reset_gpio,
 			       r_config->sequence[i].level);
 
@@ -456,6 +473,11 @@ int dsi_panel_reset(struct dsi_panel *panel)
 				(r_config->sequence[i].sleep_ms * 1000) + 100);
 	}
 
+	if (gpio_is_valid(r_config->tp_rst_gpio)) {
+		gpio_free(r_config->tp_rst_gpio);
+		DSI_DEBUG("dsp dbg: gpio_free tp_rst_gpio\n");
+	}
+
 	if (gpio_is_valid(panel->bl_config.en_gpio)) {
 		rc = gpio_direction_output(panel->bl_config.en_gpio, 1);
 		if (rc)
@@ -543,6 +565,7 @@ static bool panel_power_is_alway_on(struct dsi_panel *panel)
 static int dsi_panel_power_on(struct dsi_panel *panel)
 {
 	int rc = 0;
+	struct dsi_panel_reset_config *r_config = &panel->reset_config;
 
 	DSI_INFO("(%s)+\n", panel->name);
 
@@ -551,6 +574,25 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 		goto exit;
 	}
 
+	if (r_config->panel_on_rst_pull_down) {
+		/* need pull down lcd/tp rst first */
+		if (r_config->panel_on_tp_rst_enable && gpio_is_valid(r_config->tp_rst_gpio)) {
+			rc = gpio_request(r_config->tp_rst_gpio, "tp_rst_gpio");
+			if (rc) {
+				DSI_ERR("request for tp_rst_gpio failed, rc=%d\n", rc);
+			} else {
+				DSI_DEBUG("dsp dbg: set tp_rst_gpio to 0\n");
+				gpio_set_value(r_config->tp_rst_gpio, 0);
+				usleep_range(5500, 5500 + 100);
+			}
+			gpio_free(r_config->tp_rst_gpio);
+		}
+
+		if (gpio_is_valid(r_config->reset_gpio)) {
+			gpio_set_value(r_config->reset_gpio, 0);
+		}
+	}
+
 	rc = dsi_pwr_enable_regulator(&panel->power_info, true);
 	if (rc) {
 		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
@@ -2522,6 +2564,27 @@ static int dsi_panel_parse_reset_sequence(struct dsi_panel *panel)
 		goto error;
 	}
 
+
+	panel->reset_config.panel_on_tp_rst_enable = utils->read_bool(utils->data,
+			"qcom,mdss-panel-on-tp-rst-enable");
+
+	DSI_DEBUG("[%s] panel_on_tp_rst_enable=%d\n", panel->name,
+						panel->reset_config.panel_on_tp_rst_enable);
+
+	if (panel->reset_config.panel_on_tp_rst_enable) {
+		panel->reset_config.panel_on_rst_pull_down = utils->read_bool(utils->data,
+				"qcom,mdss-panel-on-rst-pull-down");
+
+		rc = utils->read_u32(utils->data,
+						"qcom,mdss-dsi-tp-rst-post-ms", &panel->reset_config.tp_rst_post_sleep);
+		if (rc) {
+			panel->reset_config.tp_rst_post_sleep = 0;
+		} else {
+			DSI_DEBUG("[%s] tp_rst_gpio=%d, tp_rst_post_sleep=%d\n", panel->name,
+						panel->reset_config.tp_rst_gpio, panel->reset_config.tp_rst_post_sleep);
+		}
+	}
+
 	rc = utils->read_u32_array(utils->data, "qcom,mdss-dsi-reset-sequence",
 					arr_32, length);
 	if (rc) {
@@ -2678,6 +2741,9 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel)
 		goto error;
 	}
 
+	panel->reset_config.tp_rst_gpio = utils->get_named_gpio(utils->data,
+					"qcom,mdss-dsi-tp-rst-gpio", 0);
+
 	panel->reset_config.disp_en_gpio = utils->get_named_gpio(utils->data,
 						"qcom,5v-boost-gpio",
 						0);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 7ea4313fa04a..31975c5da349 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -182,8 +182,12 @@ struct dsi_panel_reset_config {
 	int reset_gpio;
 	int disp_en_gpio;
 	int lcd_mode_sel_gpio;
+	int tp_rst_gpio;
+	u32 tp_rst_post_sleep;
 	u32 mode_sel_state;
 
+	bool panel_on_rst_pull_down;
+	bool panel_on_tp_rst_enable;
 	bool reset_force_pull_low;
 };
 

From 799f19025f24277fa20d23a37133339cdd2ae314 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Tue, 30 Jun 2020 12:11:21 +0800
Subject: [PATCH 62/94] kernel: dsi: download touch firmware after panel reset

Download touch firmware after panel reset for quick touch
response.
Move dsi_panel_get_index to the head of the C source file,
avoid compile error.

Change-Id: Id95ab836de22dfa70aa81589d26d738c4b71425a
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1649599
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 08fdc5642bd4..048edcd018be 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -260,6 +260,19 @@ int dsi_dsc_create_pps_buf_cmd(struct msm_display_dsc_info *dsc, char *buf,
 	return 128;
 }
 
+#if defined(CONFIG_PANEL_NOTIFICATIONS)
+static inline int dsi_panel_get_index(struct dsi_panel *panel)
+{
+	struct dsi_display *dsi_display =
+			container_of(panel->host, struct dsi_display, host);
+
+	if (unlikely(dsi_display == NULL))
+		return -EINVAL;
+
+	return dsi_display->display_idx;
+}
+#endif
+
 static int dsi_panel_vreg_get(struct dsi_panel *panel)
 {
 	int rc = 0;
@@ -4892,6 +4905,8 @@ int dsi_panel_prepare(struct dsi_panel *panel)
 		goto error_disable_gpio;
 	}
 
+	PANEL_NOTIFY(PANEL_EVENT_DISPLAY_ON_PREPARE);
+
 	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_PRE_ON);
 	if (rc) {
 		DSI_ERR("[%s] failed to send DSI_CMD_SET_PRE_ON cmds, rc=%d\n",
@@ -5204,19 +5219,6 @@ int dsi_panel_post_switch(struct dsi_panel *panel)
 	return rc;
 }
 
-#if defined(CONFIG_PANEL_NOTIFICATIONS)
-static inline int dsi_panel_get_index(struct dsi_panel *panel)
-{
-	struct dsi_display *dsi_display =
-			container_of(panel->host, struct dsi_display, host);
-
-	if (unlikely(dsi_display == NULL))
-		return -EINVAL;
-
-	return dsi_display->display_idx;
-}
-#endif
-
 int dsi_panel_enable(struct dsi_panel *panel)
 {
 	int rc = 0;

From 64756c8fc19d04cbc24dbeb6cbe10b4135d492ab Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Wed, 1 Jul 2020 11:53:42 +0800
Subject: [PATCH 63/94] kernel: dsi: add new backlight device to avoid conflict

New added backlight wled driver uses ko, it is not be loaded at
recovery mode. If new added backlight driver uses same backlight type
as panel0-backlight, system will call panel0-backlight when ko is not
loaded, but panel0-backlight is a logical device, cause system dead.

Change-Id: I0c03905c116aae2f42e5ca11edd89035b0cadf33
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1653756
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jing Hu <hujing3@lenovo.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 11 ++++++-----
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 048edcd018be..13760681f040 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -978,10 +978,10 @@ int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 		rc = dsi_panel_update_pwm_backlight(panel, bl_lvl);
 		break;
 	case DSI_BACKLIGHT_I2C:
-		if (!(bl->raw_bd))
-			bl->raw_bd = backlight_device_get_by_type(BACKLIGHT_RAW);
+		if (!(bl->i2c_bd))
+			bl->i2c_bd = backlight_device_get_by_type(BACKLIGHT_PLATFORM);
 		else
-			rc = backlight_device_set_brightness(bl->raw_bd, bl_lvl);
+			rc = backlight_device_set_brightness(bl->i2c_bd, bl_lvl);
 		break;
 	default:
 		DSI_ERR("Backlight type(%d) not supported\n", bl->type);
@@ -995,6 +995,7 @@ static u32 dsi_panel_get_brightness(struct dsi_backlight_config *bl)
 {
 	u32 cur_bl_level;
 	struct backlight_device *bd = bl->raw_bd;
+	struct backlight_device *i2c_bd = bl->i2c_bd;
 
 	/* default the brightness level to 50% */
 	cur_bl_level = bl->bl_max_level >> 1;
@@ -1006,8 +1007,8 @@ static u32 dsi_panel_get_brightness(struct dsi_backlight_config *bl)
 			cur_bl_level = bd->ops->get_brightness(bd);
 		break;
 	case DSI_BACKLIGHT_I2C:
-		if (bd && bd->ops && bd->ops->get_brightness)
-			cur_bl_level = bd->ops->get_brightness(bd);
+		if (i2c_bd && i2c_bd->ops && i2c_bd->ops->get_brightness)
+			cur_bl_level = i2c_bd->ops->get_brightness(i2c_bd);
 		break;
 	case DSI_BACKLIGHT_DCS:
 	case DSI_BACKLIGHT_EXTERNAL:
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 31975c5da349..081443d3e61f 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -168,6 +168,7 @@ struct dsi_backlight_config {
 	/* WLED params */
 	struct led_trigger *wled;
 	struct backlight_device *raw_bd;
+	struct backlight_device *i2c_bd;
 };
 
 struct dsi_reset_seq {

From a57b627cde17d3a837d771921a4d3b8d7d90b3b4 Mon Sep 17 00:00:00 2001
From: lixh8 <lixh8@lenovo.com>
Date: Fri, 24 Jul 2020 10:30:36 +0800
Subject: [PATCH 64/94] Capri beingup

[fit bringup] touch: synaptics: Fix wakeup_source event API change

On latest kernel wakeup_source_init API remove,
Need to use wakeup_source_register for the same.

This fix replaces wakeup_source_init to wakeup_source_register
wakeup_source_trash to wakeup_source_unregister

Change-Id: Iaddd6424c43a36bb193b9c4a90dd096a77746656
Signed-off-by: lixh8 <lixh8@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1704594
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Submit-Approved: Jira Key
Tested-by: Jira Key

Revert "[fit bringup] touch: synaptics: Fix wakeup_source event API change"

This reverts commit 436b075a3ddfae916d5c5abe310076d98614e2ce.

fix r compile errors due to qcom api changes

Change-Id: Ifb00b2c199ded097fb337d17ef0aff93a9528efb
---
 msm/dsi/dsi_display_mot_ext.c | 33 +++++++++++++++++++--------------
 msm/dsi/dsi_display_mot_ext.h |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/msm/dsi/dsi_display_mot_ext.c b/msm/dsi/dsi_display_mot_ext.c
index 46c355845a91..48201c4413cd 100644
--- a/msm/dsi/dsi_display_mot_ext.c
+++ b/msm/dsi/dsi_display_mot_ext.c
@@ -61,13 +61,13 @@ static void dsi_display_early_power_on_work(struct work_struct *work)
 		pr_warning("failed to get mot_ext\n");
 		return;
 	}
-	__pm_wakeup_event(&mot_ext->early_wake_src, 900);
+	__pm_wakeup_event(mot_ext->early_wake_src, 900);
 	display = mot_ext->display;
 	if (!display || !display->panel || !display->is_dsi_mot_primary ||
 	    (display->panel->panel_mode != DSI_OP_VIDEO_MODE) ||
 	    atomic_read(&display->panel->esd_recovery_pending)) {
 		pr_warning("----- Invalid recovery use case, early_power_state: %d\n", mot_ext->early_power_state);
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 
@@ -76,7 +76,7 @@ static void dsi_display_early_power_on_work(struct work_struct *work)
 		pr_warning("----- already prepared or set_mode called, early_power_state: %d, is_dsi_display_prepared %d\n",
 			mot_ext->early_power_state, display->is_dsi_display_prepared);
 		mutex_unlock(&display->display_lock);
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 	mot_ext->early_power_state = DSI_EARLY_POWER_BEGIN;
@@ -85,7 +85,7 @@ static void dsi_display_early_power_on_work(struct work_struct *work)
 	rc = dsi_display_prepare(display);
 	if (rc) {
 		pr_err("----- DSI display prepare failed, rc=%d. early_power_state %d\n", rc, mot_ext->early_power_state);
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 
@@ -94,7 +94,7 @@ static void dsi_display_early_power_on_work(struct work_struct *work)
 		mutex_unlock(&display->display_lock);
 		pr_warning("----- already enabled or set_mode called, early_power_state: %d, panel_initialized %d\n",
 			mot_ext->early_power_state, display->panel->panel_initialized);
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 	mot_ext->early_power_state = DSI_EARLY_POWER_PREPARED;
@@ -115,7 +115,7 @@ static void dsi_display_early_power_on_work(struct work_struct *work)
 	mutex_unlock(&display->display_lock);
 
 	//Do not relax wake_lock here to avoid AP enter deep suspend before early_off called, which may cause kernel panic.
-	//__pm_relax(&mot_ext->early_wake_src);
+	//__pm_relax(mot_ext->early_wake_src);
 
 	pr_info("----- early_power_state: %d, g_early_power_count %d\n", mot_ext->early_power_state, g_early_power_count++);
 }
@@ -133,26 +133,26 @@ static void dsi_display_early_power_off_work(struct work_struct *work)
 		pr_warning("failed to get mot_ext\n");
 		return;
 	}
-	__pm_wakeup_event(&mot_ext->early_wake_src, 500);
+	__pm_wakeup_event(mot_ext->early_wake_src, 500);
 	display = mot_ext->display;
 	if (!display || !display->panel ||
 	    (display->panel->panel_mode != DSI_OP_VIDEO_MODE) ||
 	    atomic_read(&display->panel->esd_recovery_pending)) {
 		pr_warning("Invalid recovery use case, early_power_state: %d\n", mot_ext->early_power_state);
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 	if (mot_ext->early_power_state != DSI_EARLY_POWER_INITIALIZED) {
 		pr_info("%s ----- no need, return.  early_power_state %d\n", __func__, mot_ext->early_power_state);
 		//mot_ext->early_power_state = DSI_EARLY_POWER_IDLE;
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 
 	rc = dsi_display_disable(display);
 	if (rc) {
 		pr_err("DSI display disable failed, rc=%d. early_power_state %d\n", rc, mot_ext->early_power_state);
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 
@@ -161,7 +161,7 @@ static void dsi_display_early_power_off_work(struct work_struct *work)
 		pr_warning("----- set_mode called, early_power_state: %d, is_dsi_display_prepared %d\n",
 			mot_ext->early_power_state, display->is_dsi_display_prepared);
 		mutex_unlock(&display->display_lock);
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 	mutex_unlock(&display->display_lock);
@@ -169,7 +169,7 @@ static void dsi_display_early_power_off_work(struct work_struct *work)
 	rc = dsi_display_unprepare(display);
 	if (rc) {
 		pr_err("DSI display unprepare failed, rc=%d. early_power_state %d\n", rc, mot_ext->early_power_state);
-		__pm_relax(&mot_ext->early_wake_src);
+		__pm_relax(mot_ext->early_wake_src);
 		return;
 	}
 
@@ -179,7 +179,7 @@ static void dsi_display_early_power_off_work(struct work_struct *work)
 	}
 	mutex_unlock(&display->display_lock);
 
-	__pm_relax(&mot_ext->early_wake_src);
+	__pm_relax(mot_ext->early_wake_src);
 
 	pr_info("----- early_power_state: %d\n", mot_ext->early_power_state);
 }
@@ -1222,7 +1222,12 @@ int dsi_display_ext_init(struct dsi_display *display)
 		return 0;
 	}
 
-	wakeup_source_init(&g_dsi_mot_ext->early_wake_src, "dsi_early_wakelock");
+	//wakeup_source_init(&g_dsi_mot_ext->early_wake_src, "dsi_early_wakelock");
+	g_dsi_mot_ext->early_wake_src = wakeup_source_register(&display->pdev->dev, "dsi_early_wakelock");
+	if(!g_dsi_mot_ext->early_wake_src){
+		pr_err("failed to create dsi early power workq!\n");
+		return 0;
+	}
 
 	INIT_WORK(&g_dsi_mot_ext->early_on_work,
 				dsi_display_early_power_on_work);
diff --git a/msm/dsi/dsi_display_mot_ext.h b/msm/dsi/dsi_display_mot_ext.h
index 124df4194529..7c428749fe39 100644
--- a/msm/dsi/dsi_display_mot_ext.h
+++ b/msm/dsi/dsi_display_mot_ext.h
@@ -50,7 +50,7 @@ struct dsi_mot_ext_feature {
 	struct work_struct early_on_work;
 	struct delayed_work early_off_work;
 	enum dsi_display_early_power_state early_power_state;
-	struct wakeup_source early_wake_src;
+	struct wakeup_source* early_wake_src;
 };
 
 /**

From 16c651cad24d6c5bb401fc11d431ba9898858b87 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Thu, 16 Jul 2020 13:16:20 +0800
Subject: [PATCH 65/94] kernel: dsi: enable tp_rst & esd fail logs

Some products handle tp reset in panel
enable tp_rst logs for better debug

Change-Id: I4ab1510cbdc9fd072dff8f2378db19c154077083
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1686088
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 13760681f040..12cfcee42e36 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -441,7 +441,7 @@ int dsi_panel_reset(struct dsi_panel *panel)
 	struct dsi_panel_reset_config *r_config = &panel->reset_config;
 	int i;
 
-	DSI_DEBUG("++\n");
+	DSI_INFO("++\n");
 	if (gpio_is_valid(panel->reset_config.disp_en_gpio)) {
 		rc = gpio_direction_output(panel->reset_config.disp_en_gpio, 1);
 		if (rc) {
@@ -469,7 +469,7 @@ int dsi_panel_reset(struct dsi_panel *panel)
 	for (i = 0; i < r_config->count; i++) {
 		/* set tp rst before lcd rst */
 		if (r_config->panel_on_tp_rst_enable && gpio_is_valid(r_config->tp_rst_gpio)) {
-			DSI_DEBUG("dsp dbg: set tp_rst_gpio to %d\n", r_config->sequence[i].level);
+			DSI_INFO("dsp dbg: set tp_rst_gpio to %d\n", r_config->sequence[i].level);
 			gpio_set_value(r_config->tp_rst_gpio, r_config->sequence[i].level);
 
 			if (r_config->tp_rst_post_sleep && r_config->tp_rst_post_sleep < 200) {
@@ -594,7 +594,7 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 			if (rc) {
 				DSI_ERR("request for tp_rst_gpio failed, rc=%d\n", rc);
 			} else {
-				DSI_DEBUG("dsp dbg: set tp_rst_gpio to 0\n");
+				DSI_INFO("dsp dbg: set tp_rst_gpio to 0\n");
 				gpio_set_value(r_config->tp_rst_gpio, 0);
 				usleep_range(5500, 5500 + 100);
 			}
@@ -3646,8 +3646,10 @@ static bool dsi_panel_parse_esd_status_len(struct dsi_parser_utils *utils,
 {
 	int tmp;
 
-	if (!utils->find_property(utils->data, prop_key, &tmp))
+	if (!utils->find_property(utils->data, prop_key, &tmp)) {
+		DSI_ERR("find_property return false!\n");
 		return false;
+	}
 
 	tmp /= sizeof(u32);
 	if (tmp != cmd_cnt) {

From 740a0d62c6fd5ab1888b51920ceae1fdfdc666bd Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Wed, 5 Aug 2020 17:16:55 +0800
Subject: [PATCH 66/94] kernel: dsi: tp_rst seq update

Cebu: tp rst seq need pull high before lcd_rst
Update to rst logic

Change-Id: I16632ccf9f5fc7e79fa8f985097c234b9fc6b7a9
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1714969
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 12cfcee42e36..f809f20e841a 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -450,6 +450,22 @@ int dsi_panel_reset(struct dsi_panel *panel)
 		}
 	}
 
+	/* set tp rst before lcd rst */
+	if (r_config->panel_on_tp_rst_enable && gpio_is_valid(r_config->tp_rst_gpio)) {
+		rc = gpio_request(r_config->tp_rst_gpio, "tp_rst_gpio");
+		if (rc) {
+			DSI_ERR("request for tp_rst_gpio failed, rc=%d\n", rc);
+		} else {
+			DSI_INFO("dsp dbg: set tp_rst_gpio to 1 \n");
+			gpio_set_value(r_config->tp_rst_gpio, 1);
+
+			if (r_config->tp_rst_post_sleep && r_config->tp_rst_post_sleep < 200) {
+				usleep_range(r_config->tp_rst_post_sleep*1000, (r_config->tp_rst_post_sleep*1000 + 10));
+			}
+		}
+		gpio_free(r_config->tp_rst_gpio);
+	}
+
 	if (r_config->count) {
 		rc = gpio_direction_output(r_config->reset_gpio,
 			r_config->sequence[0].level);
@@ -459,38 +475,15 @@ int dsi_panel_reset(struct dsi_panel *panel)
 		}
 	}
 
-	if (r_config->panel_on_tp_rst_enable && gpio_is_valid(r_config->tp_rst_gpio)) {
-		rc = gpio_request(r_config->tp_rst_gpio, "tp_rst_gpio");
-		if (rc) {
-			DSI_ERR("request for tp_rst_gpio failed, rc=%d\n", rc);
-		}
-	}
-
 	for (i = 0; i < r_config->count; i++) {
-		/* set tp rst before lcd rst */
-		if (r_config->panel_on_tp_rst_enable && gpio_is_valid(r_config->tp_rst_gpio)) {
-			DSI_INFO("dsp dbg: set tp_rst_gpio to %d\n", r_config->sequence[i].level);
-			gpio_set_value(r_config->tp_rst_gpio, r_config->sequence[i].level);
-
-			if (r_config->tp_rst_post_sleep && r_config->tp_rst_post_sleep < 200) {
-				usleep_range(r_config->tp_rst_post_sleep*1000, (r_config->tp_rst_post_sleep*1000 + 10));
-			}
-		}
-
 		gpio_set_value(r_config->reset_gpio,
 			       r_config->sequence[i].level);
 
-
 		if (r_config->sequence[i].sleep_ms)
 			usleep_range(r_config->sequence[i].sleep_ms * 1000,
 				(r_config->sequence[i].sleep_ms * 1000) + 100);
 	}
 
-	if (gpio_is_valid(r_config->tp_rst_gpio)) {
-		gpio_free(r_config->tp_rst_gpio);
-		DSI_DEBUG("dsp dbg: gpio_free tp_rst_gpio\n");
-	}
-
 	if (gpio_is_valid(panel->bl_config.en_gpio)) {
 		rc = gpio_direction_output(panel->bl_config.en_gpio, 1);
 		if (rc)
@@ -602,7 +595,9 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 		}
 
 		if (gpio_is_valid(r_config->reset_gpio)) {
+			DSI_INFO("dsp dbg: set lcd reset_gpio to 0\n");
 			gpio_set_value(r_config->reset_gpio, 0);
+			usleep_range(3000, 3000 + 100);
 		}
 	}
 
@@ -3647,7 +3642,6 @@ static bool dsi_panel_parse_esd_status_len(struct dsi_parser_utils *utils,
 	int tmp;
 
 	if (!utils->find_property(utils->data, prop_key, &tmp)) {
-		DSI_ERR("find_property return false!\n");
 		return false;
 	}
 

From 657105bfb6b5eb3ac9406d5568717d1c629d24b4 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Mon, 10 Aug 2020 17:17:43 +0800
Subject: [PATCH 67/94] kernel: dsi: rst pull down config update

update panel_on_rst_pull_down config independent,
some panel need pull down lcd rst only without tp_rst config

Change-Id: I803d063c5c7d224618d5f8960d5373b1671045dc
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1718350
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index f809f20e841a..852f6788ea0b 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2580,10 +2580,10 @@ static int dsi_panel_parse_reset_sequence(struct dsi_panel *panel)
 	DSI_DEBUG("[%s] panel_on_tp_rst_enable=%d\n", panel->name,
 						panel->reset_config.panel_on_tp_rst_enable);
 
-	if (panel->reset_config.panel_on_tp_rst_enable) {
-		panel->reset_config.panel_on_rst_pull_down = utils->read_bool(utils->data,
-				"qcom,mdss-panel-on-rst-pull-down");
+	panel->reset_config.panel_on_rst_pull_down = utils->read_bool(utils->data,
+                                "qcom,mdss-panel-on-rst-pull-down");
 
+	if (panel->reset_config.panel_on_tp_rst_enable) {
 		rc = utils->read_u32(utils->data,
 						"qcom,mdss-dsi-tp-rst-post-ms", &panel->reset_config.tp_rst_post_sleep);
 		if (rc) {

From a8cf6596f0bde1c7136967a99507dba9dc2467d0 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Tue, 27 Oct 2020 17:56:50 +0800
Subject: [PATCH 68/94] kernel:dsi: backlight update for hbm gpio

Backlight: support hbm gpio
add backlight update when hbm on/off

Change-Id: Iea72f37e645264b65773f054499fec07df846a03
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1785873
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 852f6788ea0b..691f0b31b850 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1131,11 +1131,16 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 				gpio_direction_output(panel->hbm_en_gpio, 0);
 				pr_info("Set HBM to (%d) with GPIO%d\n", param_info->value, panel->hbm_en_gpio);
 			}
-			} else {
-				DSI_ERR("%s: invalid params\n", __func__);
-				rc = -EINVAL;
-			}
+
+			rc = dsi_panel_set_backlight(panel, HBM_BRIGHTNESS(param_info->value));
+			if (rc)
+				DSI_ERR("Set HBM: unable to set backlight\n");
+
 		} else {
+			DSI_ERR("%s: invalid params\n", __func__);
+			rc = -EINVAL;
+		}
+	} else {
 		rc = dsi_panel_send_param_cmd(panel, param_info);
 		if (rc < 0) {
 			DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);

From e9809af5c5cf673e3dbcbcccfd403e5aca15147a Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Wed, 18 Nov 2020 15:03:56 +0800
Subject: [PATCH 69/94] kernel:dsi: backlight update for hbm gpio

Backlight: hbm gpio support update
set hbm state for hbm gpio case
to fix issue: should ignore backlight update when HBM on

Change-Id: Ic45b158cf01f0dcecedf3893d8b92fc8ed3aff32
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1805329
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 691f0b31b850..407d2f6ec4e9 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1123,6 +1123,9 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 
 	if (panel->hbm_type == HBM_TYPE_LCD_DCS_GPIO) {
 		if (gpio_is_valid(panel->hbm_en_gpio)) {
+			struct panel_param *panel_param = &dsi_panel_param[0][PARAM_HBM_ID];
+
+			panel_param->value = param_info->value;
 			if (param_info->value) {
 				gpio_direction_output(panel->hbm_en_gpio, 1);
 				pr_info("Set HBM to (%d) with GPIO%d\n", param_info->value, panel->hbm_en_gpio);
@@ -2820,8 +2823,8 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel)
 	if (!gpio_is_valid(panel->hbm_en_gpio))
 		DSI_ERR("%s:%d, HBM enable gpio not specified\n",
 						__func__, __LINE__);
-
-	DSI_ERR("%s:%d, HBM enable gpio not specified, gpio%d\n",
+	else
+		DSI_INFO("%s:%d, HBM enable gpio%d\n",
 					__func__, __LINE__, panel->hbm_en_gpio);
 
 error:

From f55d5421662ee6c2f32ec975e9c2bf6981689c41 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Mon, 7 Dec 2020 15:35:25 +0800
Subject: [PATCH 70/94] kernel:dsi: ESD te support for video mode panel

Add ESD TE check on video mode panel
to fix TP noise issue when configed as read_reg ESD

Change-Id: Idf6ce40fd4275a03f169f8c3bca48e56303b1c77
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1820691
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c   | 98 +++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.c     | 10 +++++
 msm/dsi/dsi_panel.h     |  8 ++++
 msm/sde/sde_connector.c |  4 ++
 4 files changed, 120 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 194510fdd18e..bb61e950f30d 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -837,6 +837,21 @@ static int dsi_display_status_check_te(struct dsi_display *display)
 	return rc;
 }
 
+static int dsi_display_status_check_te_video(struct dsi_display *display)
+{
+	int rc = 1;
+	struct dsi_panel *panel = display->panel;
+
+	if((panel->video_te_count - panel->video_te_count_priv) > 1) {
+		panel->video_te_count_priv = panel->video_te_count;
+	} else {
+		DSI_ERR("%s: video TE check ERROR te_count %d, priv =%d\n", __func__, panel->video_te_count, panel->video_te_count_priv);
+		rc = 0;
+	}
+
+	return rc;
+}
+
 int dsi_display_check_status(struct drm_connector *connector, void *display,
 					bool te_check_override)
 {
@@ -895,6 +910,8 @@ int dsi_display_check_status(struct drm_connector *connector, void *display,
 		rc = dsi_display_status_reg_read(dsi_display);
 	} else if (status_mode == ESD_MODE_SW_BTA) {
 		rc = dsi_display_status_bta_request(dsi_display);
+	} else if (status_mode == ESD_MODE_PANEL_TE_VIDEO) {
+		rc = dsi_display_status_check_te_video(dsi_display);
 	} else if (status_mode == ESD_MODE_PANEL_TE) {
 		rc = dsi_display_status_check_te(dsi_display);
 	} else {
@@ -4055,6 +4072,76 @@ error:
 	return rc;
 }
 
+static void dsi_video_te_irq_work(struct work_struct *work)
+{
+	struct dsi_panel *panel = NULL;
+	struct delayed_work *dw = to_delayed_work(work);
+
+	panel = container_of(dw, struct dsi_panel, te_event_work);
+	if (!panel) {
+		DSI_ERR("%s: invalid panel data\n", __func__);
+		return;
+	}
+
+	if(panel->video_te_count%60 == 0)
+		DSI_INFO("%s video te count = %d\n", __func__, panel->video_te_count);
+
+	enable_irq(panel->video_te_irq);
+}
+
+extern u32 interval_video_te;
+static irqreturn_t dsi_video_te_interrupt(int irq, void *data)
+{
+	struct dsi_panel *panel = data;
+
+	disable_irq_nosync(irq);
+
+	if(panel->video_te_count++ < 3000) {
+		enable_irq(irq);
+	} else {
+		queue_delayed_work(panel->workq, &panel->te_event_work, msecs_to_jiffies(interval_video_te/3));
+		//DSI_DEBUG("%s video_te_count=%d\n", __func__, panel->video_te_count);
+	}
+
+	return IRQ_HANDLED;
+}
+
+static int dsi_init_video_te_irq(struct dsi_panel *panel)
+{
+	int rc = -1;
+
+	if (gpio_is_valid(panel->video_te_gpio)) {
+		rc = gpio_request(panel->video_te_gpio, "video-te-gpio");
+		if (rc < 0) {
+			DSI_ERR("%s: video te gpio_request fail rc=%d\n", __func__,rc);
+			return rc ;
+		}
+
+		rc = gpio_direction_input(panel->video_te_gpio);
+		if (rc < 0) {
+			DSI_ERR("%s: video te gpio_direction_input fail rc=%d\n", __func__ ,rc);
+			return rc ;
+		}
+
+		panel->video_te_count_priv = 0;
+		panel->video_te_count = 3;
+		panel->video_te_irq = gpio_to_irq(panel->video_te_gpio);
+		DSI_INFO("%s:	irq = %d, gpio=%d\n", __func__, panel->video_te_irq, panel->video_te_gpio);
+
+		rc = request_threaded_irq(panel->video_te_irq, dsi_video_te_interrupt, NULL,
+									 IRQF_TRIGGER_RISING|IRQF_ONESHOT, "video-te-irq", panel);
+		if (rc < 0) {
+			DSI_ERR("%s: video te request_irq fail rc=%d\n",__func__, rc);
+			return rc ;
+		}
+	} else {
+		DSI_ERR("%s: video te irq gpio not provided\n", __func__);
+		return rc ;
+	}
+
+	return 0;
+}
+
 static int dsi_display_res_init(struct dsi_display *display)
 {
 	int rc = 0;
@@ -4117,6 +4204,17 @@ static int dsi_display_res_init(struct dsi_display *display)
 		goto error_ctrl_put;
 	}
 
+	if(display->panel->esd_config.status_mode == ESD_MODE_PANEL_TE_VIDEO) {
+		display->panel->workq = create_workqueue("mdss_dsi_video_te");
+		if (!(display->panel->workq)) {
+			DSI_ERR("%s: Error creating video te workqueue\n", __func__);
+			goto error_ctrl_put;
+		}
+
+		INIT_DELAYED_WORK(&(display->panel->te_event_work), dsi_video_te_irq_work);
+		dsi_init_video_te_irq(display->panel);
+	}
+
 	return 0;
 error_ctrl_put:
 	for (i = i - 1; i >= 0; i--) {
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 407d2f6ec4e9..ad0ed0f227e5 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2761,6 +2761,12 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel)
 	panel->reset_config.tp_rst_gpio = utils->get_named_gpio(utils->data,
 					"qcom,mdss-dsi-tp-rst-gpio", 0);
 
+	panel->video_te_gpio = utils->get_named_gpio(utils->data,
+					"qcom,video-te-gpio", 0);
+	if (panel->video_te_gpio && gpio_is_valid(panel->video_te_gpio)) {
+		DSI_INFO("%s:%d, Video TE gpio is specified\n", __func__, __LINE__);
+	}
+
 	panel->reset_config.disp_en_gpio = utils->get_named_gpio(utils->data,
 						"qcom,5v-boost-gpio",
 						0);
@@ -3829,6 +3835,8 @@ static int dsi_panel_parse_esd_config(struct dsi_panel *panel)
 			esd_config->status_mode = ESD_MODE_SW_BTA;
 		} else if (!strcmp(string, "reg_read")) {
 			esd_config->status_mode = ESD_MODE_REG_READ;
+		} else if (!strcmp(string, "te_signal_check_video")) {
+			esd_config->status_mode = ESD_MODE_PANEL_TE_VIDEO;
 		} else if (!strcmp(string, "te_signal_check")) {
 			if (panel->panel_mode == DSI_OP_CMD_MODE) {
 				esd_config->status_mode = ESD_MODE_PANEL_TE;
@@ -3858,6 +3866,8 @@ static int dsi_panel_parse_esd_config(struct dsi_panel *panel)
 		esd_mode = "register_read";
 	} else if (panel->esd_config.status_mode == ESD_MODE_SW_BTA) {
 		esd_mode = "bta_trigger";
+	} else if (panel->esd_config.status_mode == ESD_MODE_PANEL_TE_VIDEO) {
+		esd_mode = "te_check_video";
 	} else if (panel->esd_config.status_mode ==  ESD_MODE_PANEL_TE) {
 		esd_mode = "te_check";
 	}
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 081443d3e61f..abec34230f6b 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -196,6 +196,7 @@ enum esd_check_status_mode {
 	ESD_MODE_REG_READ,
 	ESD_MODE_SW_BTA,
 	ESD_MODE_PANEL_TE,
+	ESD_MODE_PANEL_TE_VIDEO,
 	ESD_MODE_SW_SIM_SUCCESS,
 	ESD_MODE_SW_SIM_FAILURE,
 	ESD_MODE_MAX
@@ -291,6 +292,13 @@ struct dsi_panel {
 	struct drm_panel_hdr_properties hdr_props;
 	struct drm_panel_esd_config esd_config;
 
+	struct workqueue_struct *workq;
+	struct delayed_work te_event_work;
+	int video_te_gpio;
+	u32 video_te_count;
+	u32 video_te_count_priv;
+	int video_te_irq;
+
 	struct dsi_parser_utils utils;
 
 	bool lp11_init;
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index ee47ecab9170..6f7229831b46 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -2293,6 +2293,7 @@ int sde_connector_esd_status(struct drm_connector *conn)
 	return ret;
 }
 
+u32 interval_video_te = STATUS_CHECK_INTERVAL_MS;
 static void sde_connector_check_status_work(struct work_struct *work)
 {
 	struct sde_connector *conn;
@@ -2328,6 +2329,9 @@ static void sde_connector_check_status_work(struct work_struct *work)
 		/* If debugfs property is not set then take default value */
 		interval = conn->esd_status_interval ?
 			conn->esd_status_interval : STATUS_CHECK_INTERVAL_MS;
+
+		interval_video_te = interval;
+
 		schedule_delayed_work(&conn->status_work,
 			msecs_to_jiffies(interval));
 		return;

From 17390af7e7bf9bb3f357938df21dc120d5fb8fb8 Mon Sep 17 00:00:00 2001
From: Joo Costa <jmcosta@motorola.com>
Date: Thu, 15 Apr 2021 13:48:00 -0300
Subject: [PATCH 71/94] [Guam NA] Fix propagation error in dsi_display.c

Fix conditions placement error in dsi_display_disable() and
dsi_display_unprepare(), which were swapped probably due to a mistake
during propagation.

Now, the display turns on correctly and the moto extended dsi features
can be used.

The MMI_STOPSHIP will be removed from bengal-guamna-display.dtsi in a
follow-up commit.

Change-Id: If730caf231f74968037bffec89d04cb5656529a9
Signed-off-by: Joo Costa <jmcosta@motorola.com>
Reviewed-on: https://gerrit.mot.com/1925140
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Tiago Ganselli <ganselli@motorola.com>
Reviewed-by: Sergio Vilela <sergiosv@motorola.com>
Reviewed-by: Carlos Pinho <cpinho@motorola.com>
Submit-Approved: Sergio Vilela <sergiosv@motorola.com>
---
 msm/dsi/dsi_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index bb61e950f30d..bae28b81926d 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8342,7 +8342,7 @@ int dsi_display_disable(struct dsi_display *display)
 
 	//Check is Mot early power is on going
 	pr_info("display %p, name %s is_dsi_mot_primary(%d)\n", display, display->name, display->is_dsi_mot_primary);
-	if ( display->is_dsi_mot_early_power_enabled && !display->is_dsi_display_prepared) {
+	if ( display->is_dsi_mot_early_power_enabled && !dsi_panel_initialized(display->panel)) {
 		mutex_unlock(&display->display_lock);
 		pr_info("panel already unprepared\n");
 		return rc;
@@ -8412,7 +8412,7 @@ int dsi_display_unprepare(struct dsi_display *display)
 	mutex_lock(&display->display_lock);
 
 	//Check if Mot early power is on going
-	if ( display->is_dsi_mot_early_power_enabled && !dsi_panel_initialized(display->panel)) {
+	if ( display->is_dsi_mot_early_power_enabled && !display->is_dsi_display_prepared) {
 		mutex_unlock(&display->display_lock);
 		pr_info("panel already disabled\n");
 		return rc;

From 3d023239dcaae77d81b2f667211f6c75782da107 Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@lenovo.com>
Date: Thu, 3 Jun 2021 14:10:48 +0800
Subject: [PATCH 72/94] display: support ft8006s panel brightness level special
 align

support ft8006s panel brightness level special align

DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0 means:
  12bit brightness
  51H: DVB[11:4]
  52H: DVB[3:0]

Change-Id: I3b4e27eefe07a8ec11badf08a1000c976c79266f
Reviewed-on: https://gerrit.mot.com/1999763
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 13 +++++++++++++
 msm/dsi/dsi_panel.h |  7 +++++++
 2 files changed, 20 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index ad0ed0f227e5..d10c95839675 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -814,6 +814,9 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	dsi = &panel->mipi_device;
 	bl = &panel->bl_config;
 
+	if (panel->bl_config.bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0)
+		bl_lvl = (((bl_lvl & 0xff0) << 4) | (bl_lvl & 0x0f));
+
 	if (panel->bl_config.bl_inverted_dbv)
 		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
 
@@ -2946,6 +2949,16 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 	panel->bl_config.bl_inverted_dbv = utils->read_bool(utils->data,
 		"qcom,mdss-dsi-bl-inverted-dbv");
 
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bl-level-align", &val);
+	if (rc) {
+		DSI_DEBUG("[%s] bl_level_align unspecified, defaulting to normal, no special algin\n",
+			 panel->name);
+		panel->bl_config.bl_level_align = DSI_BACKLIGHT_LEVEL_ALIGN_NORMAL;
+	} else {
+		panel->bl_config.bl_level_align = val;
+	}
+
 	panel->bl_config.bl_2bytes_enable = utils->read_bool(utils->data,
 			"qcom,bklt-dcs-2bytes-enabled");
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index abec34230f6b..ee37a7a99f1b 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -85,6 +85,12 @@ enum dsi_backlight_type {
 	DSI_BACKLIGHT_MAX,
 };
 
+enum dsi_backlight_level_align_type {
+	DSI_BACKLIGHT_LEVEL_ALIGN_NORMAL = 0,
+	DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0 = 1,
+};
+
+
 enum bl_update_flag {
 	BL_UPDATE_DELAY_UNTIL_FIRST_FRAME,
 	BL_UPDATE_NONE,
@@ -156,6 +162,7 @@ struct dsi_backlight_config {
 	u32 bl_level;
 	u32 bl_scale;
 	u32 bl_scale_sv;
+	u32 bl_level_align;
 	bool bl_inverted_dbv;
 	u32 bl_dcs_subtype;
 

From a8549189234c516c54df71d1e34063231fed1371 Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@lenovo.com>
Date: Thu, 26 Aug 2021 16:50:14 +0800
Subject: [PATCH 73/94] propagation: panel: add ft8006s special reset timing
 control

add a panel reset before touch reset enable for
djn ft8006s special timing

Change-Id: I29a103bd6a0c0f9663e1d956024e922fe17b3af8
Signed-off-by: tanhua1 <tanhua1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2051894
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/2053274
Reviewed-by: Marcos Sassahara <msassaha@motorola.com>
Reviewed-by: Carlos Pinho <cpinho@motorola.com>
---
 msm/dsi/dsi_panel.c | 25 +++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index d10c95839675..8f72008cb4a3 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -452,6 +452,16 @@ int dsi_panel_reset(struct dsi_panel *panel)
 
 	/* set tp rst before lcd rst */
 	if (r_config->panel_on_tp_rst_enable && gpio_is_valid(r_config->tp_rst_gpio)) {
+		if(r_config->panel_rst_due_tp_rst) {
+			DSI_INFO("dsp dbg: set lcd reset_gpio to 1\n");
+			gpio_set_value(r_config->reset_gpio, 1);
+			usleep_range(r_config->panel_rst_due_tp_rst_sleep*1000,
+				(r_config->panel_rst_due_tp_rst_sleep*1000) + 100);
+			DSI_INFO("dsp dbg: set lcd reset_gpio to 0\n");
+			gpio_set_value(r_config->reset_gpio, 0);
+			usleep_range(r_config->panel_rst_due_tp_rst_sleep*1000,
+				(r_config->panel_rst_due_tp_rst_sleep*1000) + 100);
+		}
 		rc = gpio_request(r_config->tp_rst_gpio, "tp_rst_gpio");
 		if (rc) {
 			DSI_ERR("request for tp_rst_gpio failed, rc=%d\n", rc);
@@ -2603,6 +2613,21 @@ static int dsi_panel_parse_reset_sequence(struct dsi_panel *panel)
 			DSI_DEBUG("[%s] tp_rst_gpio=%d, tp_rst_post_sleep=%d\n", panel->name,
 						panel->reset_config.tp_rst_gpio, panel->reset_config.tp_rst_post_sleep);
 		}
+
+		panel->reset_config.panel_rst_due_tp_rst = utils->read_bool(utils->data,
+				"qcom,mdss-panel-rst-due-tp-rst");
+
+		DSI_INFO("[%s] panel_rst_due_tp_rst=%d\n", panel->name,
+							panel->reset_config.panel_rst_due_tp_rst);
+
+		rc = utils->read_u32(utils->data,
+						"qcom,mdss-dsi-panel-rst-due-tp-post-ms", &panel->reset_config.panel_rst_due_tp_rst_sleep);
+		if (rc) {
+			panel->reset_config.panel_rst_due_tp_rst_sleep = 0;
+		} else {
+			DSI_INFO("[%s] panel_rst_due_tp_rst_sleep=%d\n", panel->name,
+						panel->reset_config.panel_rst_due_tp_rst_sleep);
+		}
 	}
 
 	rc = utils->read_u32_array(utils->data, "qcom,mdss-dsi-reset-sequence",
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index ee37a7a99f1b..d122011e9b8b 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -192,11 +192,13 @@ struct dsi_panel_reset_config {
 	int lcd_mode_sel_gpio;
 	int tp_rst_gpio;
 	u32 tp_rst_post_sleep;
+	u32 panel_rst_due_tp_rst_sleep;
 	u32 mode_sel_state;
 
 	bool panel_on_rst_pull_down;
 	bool panel_on_tp_rst_enable;
 	bool reset_force_pull_low;
+	bool panel_rst_due_tp_rst;
 };
 
 enum esd_check_status_mode {

From 8256494319229b33abfd3bc416d2272e6a8fb7c6 Mon Sep 17 00:00:00 2001
From: Flavio Ipiranga <fiaraujo@motorola.com>
Date: Thu, 30 Sep 2021 15:18:28 -0300
Subject: [PATCH 74/94] Fix: display blinking issue

Brightness parameter was being updated more than once
and more than one way inside dsi_panel_update_backlight function.

This parameter should be set just once and only in one way inside
dsi_panel_update_backlight function.

Change-Id: I8090e04034fa2fb2c4590b643df0a8a303759129
Reviewed-on: https://gerrit.mot.com/2081098
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Rafael Ortolan <rafones@motorola.com>
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Ling Jin <lingjin@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 8f72008cb4a3..a7c32f41754c 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -832,10 +832,7 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 
 	if (panel->bl_config.bl_dcs_subtype == 0xc2)
 		rc = dsi_panel_dcs_set_display_brightness_c2(dsi, bl_lvl);
-	else
-		rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);
-
-	if (bl->bl_2bytes_enable)
+	else if (bl->bl_2bytes_enable)
 		rc = mipi_dsi_dcs_set_display_brightness_2bytes(dsi, bl_lvl);
 	else
 		rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);

From 9e130d9052800bb21c28599fdb7c173defed451b Mon Sep 17 00:00:00 2001
From: huaqin79 <huaqin79@motorola.com>
Date: Tue, 7 Dec 2021 14:51:09 +0800
Subject: [PATCH 75/94] display: Modify the lcd reset gpio pin.

Modify the lcd reset gpio for
Rhode

Change-Id: I9e63931c462aba6584575f63778b9c19e11a9e49
Signed-off-by: huaqin79 <huaqin79@motorola.com>
Reviewed-on: https://gerrit.mot.com/2136967
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index a7c32f41754c..8b835be6243c 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2685,6 +2685,8 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 
 	panel->reset_gpio_always_on = utils->read_bool(utils->data,
 			"qcom,platform-reset-gpio-always-on");
+	panel->reset_config.reset_force_pull_low = of_property_read_bool(utils->data,
+				"qcom,mdss-dsi-reset-force-pull-low");
 
 	return 0;
 }

From 4bdf5764112131298b119b56d67a192e22850e7d Mon Sep 17 00:00:00 2001
From: daiss1 <daiss1@lenovo.com>
Date: Mon, 10 May 2021 11:14:30 +0800
Subject: [PATCH 76/94] drm: Add the DC panel param feature

Add the DC panel param feature which will be controlled
from the user-space

Change-Id: Ia241893614f91ba209ce830db033033235da2dfc
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1946756
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
Signed-off-by: tanhua1 <tanhua1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2160847
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
---
 msm/dsi/dsi_defs.h      |  4 ++++
 msm/dsi/dsi_panel.c     | 28 +++++++++++++++++++++++++++-
 msm/dsi/dsi_panel.h     |  6 ++++++
 msm/msm_drv.h           |  2 ++
 msm/sde/sde_connector.c | 10 ++++++++++
 msm/sde/sde_motUtil.c   |  3 +++
 msm/sde/sde_motUtil.h   |  1 +
 7 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 774e1ba9c86a..6dc5b70a287b 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -289,6 +289,8 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_CABC_UI:                   CABC UI mode
  * @DSI_CMD_SET_CABC_MV:                   CABC MV mode
  * @DSI_CMD_SET_CABC_DIS:                  CABC DIS mode
+ * @DSI_CMD_SET_DC_ON:                    DC mode on
+ * @DSI_CMD_SET_DC_OFF:                   DC mode off
  * @DSI_CMD_SET_MAX
  */
 enum dsi_cmd_set_type {
@@ -323,6 +325,8 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_CABC_UI,
 	DSI_CMD_SET_CABC_MV,
 	DSI_CMD_SET_CABC_DIS,
+	DSI_CMD_SET_DC_ON,
+	DSI_CMD_SET_DC_OFF,
 	DSI_CMD_SET_MAX
 };
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 8b835be6243c..b692afb5ddff 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -135,6 +135,11 @@ static struct panel_param_val_map cabc_map[CABC_STATE_NUM] = {
 	{CABC_DIS_STATE, DSI_CMD_SET_CABC_DIS, NULL},
 };
 
+static struct panel_param_val_map dc_map[DC_STATE_NUM] = {
+	{DC_OFF_STATE, DSI_CMD_SET_DC_OFF, NULL},
+	{DC_ON_STATE, DSI_CMD_SET_DC_ON, NULL},
+};
+
 static struct panel_param dsi_panel_param[PANEL_IDX_MAX][PARAM_ID_NUM] = {
 	{
 		{"HBM", hbm_map, HBM_STATE_NUM, HBM_OFF_STATE,
@@ -142,7 +147,9 @@ static struct panel_param dsi_panel_param[PANEL_IDX_MAX][PARAM_ID_NUM] = {
 		{"CABC", cabc_map, CABC_STATE_NUM, CABC_UI_STATE,
 				CABC_UI_STATE, false},
 		{"ACL", acl_map, ACL_STATE_NUM, ACL_OFF_STATE,
-			ACL_OFF_STATE, false}
+			ACL_OFF_STATE, false},
+		{"DC", dc_map, DC_STATE_NUM, DC_OFF_STATE,
+			DC_OFF_STATE, false}
 	},
 };
 
@@ -1192,6 +1199,19 @@ static int dsi_panel_set_cabc(struct dsi_panel *panel,
         return rc;
 };
 
+static int dsi_panel_set_dc(struct dsi_panel *panel,
+                        struct msm_param_info *param_info)
+{
+	int rc = 0;
+
+	pr_info("Set DC to (%d)\n", param_info->value);
+	rc = dsi_panel_send_param_cmd(panel, param_info);
+	if (rc < 0)
+		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
+
+        return rc;
+};
+
 int dsi_panel_set_param(struct dsi_panel *panel,
 				struct msm_param_info *param_info)
 {
@@ -1213,6 +1233,8 @@ int dsi_panel_set_param(struct dsi_panel *panel,
 			break;
 		case PARAM_ACL_ID :
 			dsi_panel_set_acl(panel, param_info);
+		case PARAM_DC_ID :
+			dsi_panel_set_dc(panel, param_info);
 			break;
 		default:
 			DSI_ERR("%s: Invalid set_param type=%d\n",
@@ -2316,6 +2338,8 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-cabc-ui-command",
 	"qcom,mdss-dsi-cabc-mv-command",
 	"qcom,mdss-dsi-cabc-dis-command",
+	"qcom,mdss-dsi-dc-on-command",
+	"qcom,mdss-dsi-dc-off-command",
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -2350,6 +2374,8 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-cabc-ui-command-state",
 	"qcom,mdss-dsi-cabc-mv-command-state",
 	"qcom,mdss-dsi-cabc-dis-command-state",
+	"qcom,mdss-dsi-dc-on-command-state",
+	"qcom,mdss-dsi-dc-off-command-state",
 };
 
 static int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index d122011e9b8b..bd7d090b5b31 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -249,6 +249,12 @@ enum cabc_state {
 	CABC_STATE_NUM,
 };
 
+enum dc_state {
+	DC_OFF_STATE = 0,
+	DC_ON_STATE,
+	DC_STATE_NUM,
+};
+
 struct panel_param_val_map {
 	int state;
 	enum dsi_cmd_set_type type;
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index bb85abf8b1b7..f5c4234cfcb9 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -207,6 +207,7 @@ enum msm_mdp_conn_property {
 	CONNECTOR_PROP_HBM,
 	CONNECTOR_PROP_CABC,
 	CONNECTOR_PROP_ACL,
+	CONNECTOR_PROP_DC,
 	/* total # of properties */
 	CONNECTOR_PROP_COUNT
 };
@@ -327,6 +328,7 @@ enum msm_param_id {
 	PARAM_HBM_ID = 0,
 	PARAM_CABC_ID,
 	PARAM_ACL_ID,
+	PARAM_DC_ID,
 	PARAM_ID_NUM
 };
 
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 6f7229831b46..9c599fb22dd6 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1517,6 +1517,14 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 		if (rc)
 			goto end;
 		break;
+	case CONNECTOR_PROP_DC:
+		param_info.value = val;
+		param_info.param_idx = PARAM_DC_ID;
+		param_info.param_conn_idx = CONNECTOR_PROP_DC;
+		rc = _sde_connector_update_param(c_conn, &param_info);
+		if (rc)
+			goto end;
+		break;
 	default:
 		break;
 	}
@@ -2459,6 +2467,8 @@ static int sde_connector_install_panel_params(struct sde_connector *c_conn)
 			prop_idx = CONNECTOR_PROP_CABC;
 		else if (!strncmp(param_cmds->param_name, "ACL", 3))
 			prop_idx = CONNECTOR_PROP_ACL;
+		else if (!strncmp(param_cmds->param_name, "DC", 2))
+			prop_idx = CONNECTOR_PROP_DC;
 		else {
 			SDE_ERROR("Invalid param_name =%s\n",
 						param_cmds->param_name);
diff --git a/msm/sde/sde_motUtil.c b/msm/sde/sde_motUtil.c
index 84ff35b4caee..dc8c00979a20 100644
--- a/msm/sde/sde_motUtil.c
+++ b/msm/sde/sde_motUtil.c
@@ -220,6 +220,9 @@ static int _sde_debugfs_motUtil_kms_prop_test(struct sde_kms *kms,
 		case KMSPROPTEST_TYPE_CABC:
 			conn_prop_idx = CONNECTOR_PROP_CABC;
 			break;
+		case KMSPROPTEST_TYPE_DC:
+			conn_prop_idx = CONNECTOR_PROP_DC;
+			break;
 		default:
 			DRM_ERROR(" Invalid KMSPROPTEST_PROP_INDEX = %d\n",
 						input[KMSPROPTEST_PROP_INDEX]);
diff --git a/msm/sde/sde_motUtil.h b/msm/sde/sde_motUtil.h
index 329977ae6ac1..0248418d1270 100644
--- a/msm/sde/sde_motUtil.h
+++ b/msm/sde/sde_motUtil.h
@@ -116,6 +116,7 @@ enum sde_motUtil_kmsPropTest_ConnPropType {
 	KMSPROPTEST_TYPE_HBM,
 	KMSPROPTEST_TYPE_ACL,
 	KMSPROPTEST_TYPE_CABC,
+	KMSPROPTEST_TYPE_DC,
 };
 
 struct motUtil {

From 71541e9d76010e4bf25336974ee613c0b613dd7e Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@lenovo.com>
Date: Wed, 9 Jun 2021 09:12:50 +0800
Subject: [PATCH 77/94] drm: Add the panel color feature for game mode

Add the panel color enhance feature for game mode

COLOR_VBT:  not use, currently with QC qdcm solution
COLOR_STD:  not use, currently with QC qdcm solution
COLOR_GAME: for game mode enhance
COLOR_NONE: disale panel color enhance

Change-Id: Ia76db7e78741b2ad80081f9b6a92b1619593d938
Signed-off-by: tanhua1 <tanhua1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1974105
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/2160848
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
---
 msm/dsi/dsi_defs.h      |  8 ++++++++
 msm/dsi/dsi_panel.c     | 34 +++++++++++++++++++++++++++++++++-
 msm/dsi/dsi_panel.h     |  8 ++++++++
 msm/msm_drv.h           |  2 ++
 msm/sde/sde_connector.c | 10 ++++++++++
 msm/sde/sde_motUtil.c   |  3 +++
 msm/sde/sde_motUtil.h   |  1 +
 7 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 6dc5b70a287b..4de258eb8730 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -291,6 +291,10 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_CABC_DIS:                  CABC DIS mode
  * @DSI_CMD_SET_DC_ON:                    DC mode on
  * @DSI_CMD_SET_DC_OFF:                   DC mode off
+ * @DSI_CMD_SET_COLOR_VBT :                    COLOR VBT mode
+ * @DSI_CMD_SET_COLOR_STD:                   COLOR STD mode
+ * @DSI_CMD_SET_COLOR_GAME :                    COLOR GAME mode
+ * @DSI_CMD_SET_COLOR_NONE:                   COLOR NONE mode
  * @DSI_CMD_SET_MAX
  */
 enum dsi_cmd_set_type {
@@ -327,6 +331,10 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_CABC_DIS,
 	DSI_CMD_SET_DC_ON,
 	DSI_CMD_SET_DC_OFF,
+	DSI_CMD_SET_COLOR_VBT,
+	DSI_CMD_SET_COLOR_STD,
+	DSI_CMD_SET_COLOR_GAME,
+	DSI_CMD_SET_COLOR_NONE,
 	DSI_CMD_SET_MAX
 };
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index b692afb5ddff..85a267cd5ee3 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -140,6 +140,13 @@ static struct panel_param_val_map dc_map[DC_STATE_NUM] = {
 	{DC_ON_STATE, DSI_CMD_SET_DC_ON, NULL},
 };
 
+static struct panel_param_val_map color_map[COLOR_STATE_NUM] = {
+	{COLOR_VBT_STATE, DSI_CMD_SET_COLOR_VBT, NULL},
+	{COLOR_STD_STATE, DSI_CMD_SET_COLOR_STD, NULL},
+	{COLOR_GAME_STATE, DSI_CMD_SET_COLOR_GAME, NULL},
+	{COLOR_NONE_STATE, DSI_CMD_SET_COLOR_NONE, NULL},
+};
+
 static struct panel_param dsi_panel_param[PANEL_IDX_MAX][PARAM_ID_NUM] = {
 	{
 		{"HBM", hbm_map, HBM_STATE_NUM, HBM_OFF_STATE,
@@ -149,7 +156,9 @@ static struct panel_param dsi_panel_param[PANEL_IDX_MAX][PARAM_ID_NUM] = {
 		{"ACL", acl_map, ACL_STATE_NUM, ACL_OFF_STATE,
 			ACL_OFF_STATE, false},
 		{"DC", dc_map, DC_STATE_NUM, DC_OFF_STATE,
-			DC_OFF_STATE, false}
+			DC_OFF_STATE, false},
+		{"COLOR", color_map, COLOR_STATE_NUM, COLOR_NONE_STATE,
+			COLOR_NONE_STATE, false}
 	},
 };
 
@@ -1212,6 +1221,18 @@ static int dsi_panel_set_dc(struct dsi_panel *panel,
         return rc;
 };
 
+static int dsi_panel_set_color(struct dsi_panel *panel,
+                        struct msm_param_info *param_info)
+{
+	int rc = 0;
+
+	pr_info("Set COLOR to (%d)\n", param_info->value);
+	rc = dsi_panel_send_param_cmd(panel, param_info);
+	if (rc < 0)
+		DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
+
+        return rc;
+};
 int dsi_panel_set_param(struct dsi_panel *panel,
 				struct msm_param_info *param_info)
 {
@@ -1236,6 +1257,9 @@ int dsi_panel_set_param(struct dsi_panel *panel,
 		case PARAM_DC_ID :
 			dsi_panel_set_dc(panel, param_info);
 			break;
+		case PARAM_COLOR_ID :
+			dsi_panel_set_color(panel, param_info);
+			break;
 		default:
 			DSI_ERR("%s: Invalid set_param type=%d\n",
 				__func__, param_info->param_idx);
@@ -2340,6 +2364,10 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-cabc-dis-command",
 	"qcom,mdss-dsi-dc-on-command",
 	"qcom,mdss-dsi-dc-off-command",
+	"qcom,mdss-dsi-color-vbt-command",
+	"qcom,mdss-dsi-color-std-command",
+	"qcom,mdss-dsi-color-game-command",
+	"qcom,mdss-dsi-color-none-command",
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -2376,6 +2404,10 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-cabc-dis-command-state",
 	"qcom,mdss-dsi-dc-on-command-state",
 	"qcom,mdss-dsi-dc-off-command-state",
+	"qcom,mdss-dsi-color-vbt-command-state",
+	"qcom,mdss-dsi-color-std-command-state",
+	"qcom,mdss-dsi-color-game-command-state",
+	"qcom,mdss-dsi-color-none-command-state",
 };
 
 static int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index bd7d090b5b31..b11d842a9dbd 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -255,6 +255,14 @@ enum dc_state {
 	DC_STATE_NUM,
 };
 
+enum color_state {
+	COLOR_VBT_STATE = 0,
+	COLOR_STD_STATE,
+	COLOR_GAME_STATE,
+	COLOR_NONE_STATE,
+	COLOR_STATE_NUM,
+};
+
 struct panel_param_val_map {
 	int state;
 	enum dsi_cmd_set_type type;
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index f5c4234cfcb9..c81859bfd440 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -208,6 +208,7 @@ enum msm_mdp_conn_property {
 	CONNECTOR_PROP_CABC,
 	CONNECTOR_PROP_ACL,
 	CONNECTOR_PROP_DC,
+	CONNECTOR_PROP_COLOR,
 	/* total # of properties */
 	CONNECTOR_PROP_COUNT
 };
@@ -329,6 +330,7 @@ enum msm_param_id {
 	PARAM_CABC_ID,
 	PARAM_ACL_ID,
 	PARAM_DC_ID,
+	PARAM_COLOR_ID,
 	PARAM_ID_NUM
 };
 
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 9c599fb22dd6..867d04414f6a 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1525,6 +1525,14 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector,
 		if (rc)
 			goto end;
 		break;
+	case CONNECTOR_PROP_COLOR:
+		param_info.value = val;
+		param_info.param_idx = PARAM_COLOR_ID;
+		param_info.param_conn_idx = CONNECTOR_PROP_COLOR;
+		rc = _sde_connector_update_param(c_conn, &param_info);
+		if (rc)
+			goto end;
+		break;
 	default:
 		break;
 	}
@@ -2469,6 +2477,8 @@ static int sde_connector_install_panel_params(struct sde_connector *c_conn)
 			prop_idx = CONNECTOR_PROP_ACL;
 		else if (!strncmp(param_cmds->param_name, "DC", 2))
 			prop_idx = CONNECTOR_PROP_DC;
+		else if (!strncmp(param_cmds->param_name, "COLOR", 5))
+			prop_idx = CONNECTOR_PROP_COLOR;
 		else {
 			SDE_ERROR("Invalid param_name =%s\n",
 						param_cmds->param_name);
diff --git a/msm/sde/sde_motUtil.c b/msm/sde/sde_motUtil.c
index dc8c00979a20..a3c23bd8bb2d 100644
--- a/msm/sde/sde_motUtil.c
+++ b/msm/sde/sde_motUtil.c
@@ -223,6 +223,9 @@ static int _sde_debugfs_motUtil_kms_prop_test(struct sde_kms *kms,
 		case KMSPROPTEST_TYPE_DC:
 			conn_prop_idx = CONNECTOR_PROP_DC;
 			break;
+		case KMSPROPTEST_TYPE_COLOR:
+			conn_prop_idx = CONNECTOR_PROP_COLOR;
+			break;
 		default:
 			DRM_ERROR(" Invalid KMSPROPTEST_PROP_INDEX = %d\n",
 						input[KMSPROPTEST_PROP_INDEX]);
diff --git a/msm/sde/sde_motUtil.h b/msm/sde/sde_motUtil.h
index 0248418d1270..47f3e4ce3065 100644
--- a/msm/sde/sde_motUtil.h
+++ b/msm/sde/sde_motUtil.h
@@ -117,6 +117,7 @@ enum sde_motUtil_kmsPropTest_ConnPropType {
 	KMSPROPTEST_TYPE_ACL,
 	KMSPROPTEST_TYPE_CABC,
 	KMSPROPTEST_TYPE_DC,
+	KMSPROPTEST_TYPE_COLOR,
 };
 
 struct motUtil {

From 4c43e4cb74d2850d2e1e24f65ea7bdced3aee5ed Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 16 Jan 2020 10:58:31 -0600
Subject: [PATCH 78/94] disp: msm: Fixing motUtil tool for ACL feature

- Mot's panel param feature is working with sending single MIPI DSI
command, but it doesn't work correct with sending more than one MIPI
DSI commands
- Enable ACL support to enable or disable ACL feature with the MotUtil
tool. This tool is designed to validate the MOT display DRM Framework.

Change-Id: I211818d9c2b2c8a736f4dfc1768c78357383c531
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697631
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Signed-off-by: tanhua1 <tanhua1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2168949
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
---
 msm/dsi/dsi_panel.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 85a267cd5ee3..143ffd80862a 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1072,14 +1072,15 @@ static int dsi_panel_pwm_register(struct dsi_panel *panel)
 static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
                                 struct msm_param_info *param_info)
 {
-	int rc = 0;
+	int rc = 0, i = 0;
 	struct panel_param_val_map *param_map;
 	struct panel_param_val_map *param_map_state;
 	struct panel_param *panel_param;
 	struct dsi_cmd_desc *cmds;
 	ssize_t len;
-	const struct mipi_dsi_host_ops *ops = panel->host->ops;
+	u32 count;
 
+	const struct mipi_dsi_host_ops *ops = panel->host->ops;
 	panel_param = &panel->param_cmds[param_info->param_idx];
 	if (!panel_param) {
 		DSI_ERR("%s: invalid panel_param.\n", __func__);
@@ -1115,20 +1116,22 @@ static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
 		}
 
 		cmds = param_map_state->cmds->cmds;
-		if (param_map_state->cmds->state == DSI_CMD_SET_STATE_LP)
-			cmds->msg.flags |= MIPI_DSI_MSG_USE_LPM |
-						MIPI_DSI_MSG_LASTCOMMAND;
-		if (cmds->last_command)
-			cmds->msg.flags |= MIPI_DSI_MSG_LASTCOMMAND;
+		count = param_map_state->cmds->count;
 
-		len = ops->transfer(panel->host, &cmds->msg);
-		if (len < 0) {
-			rc = len;
-			DSI_ERR("%s:failed to send param cmd, rc=%d\n",
-					__func__, rc);
-			goto end;
+		for (i =0; i < count; i++) {
+			if (param_map_state->cmds->state == DSI_CMD_SET_STATE_LP)
+				cmds->msg.flags |= MIPI_DSI_MSG_USE_LPM;
+			if (cmds->last_command)
+				cmds->msg.flags |= MIPI_DSI_MSG_LASTCOMMAND;
+			len = ops->transfer(panel->host, &cmds->msg);
+			if (len < 0) {
+				rc = len;
+				DSI_ERR("%s:failed to send param cmd, rc=%d\n",
+						__func__, rc);
+				goto end;
+			}
+			cmds++;
 		}
-
 		panel_param->value = param_info->value;
 		DSI_INFO("(%d) is setting new value %d\n",
 			param_info->param_idx, param_info->value);

From 52b149c95414c7b4d12f8b2e9763b367b60179c4 Mon Sep 17 00:00:00 2001
From: tinno18 <tinno18@motorola.com>
Date: Mon, 17 Jan 2022 20:33:23 +0800
Subject: [PATCH 79/94] HAWAO+OLED: solve mipi driver strength weak problem

- change glbl_rescode_top_ctrl
- change glbl_rescode_bot_ctrl

Change-Id: I77bd5cfbefa4e19b76b40de9514dfeca8dd3fce8
Reviewed-on: https://gerrit.mot.com/2171927
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c     | 14 ++++++++++++++
 msm/dsi/dsi_panel.c       | 18 ++++++++++++++++++
 msm/dsi/dsi_panel.h       |  3 +++
 msm/dsi/dsi_phy_hw.h      |  2 ++
 msm/dsi/dsi_phy_hw_v4_0.c |  8 ++++++++
 5 files changed, 45 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index bae28b81926d..5b0b7df4de87 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5031,6 +5031,19 @@ static void dsi_display_validate_dms_fps(struct dsi_display_mode *cur_mode,
 	}
 }
 
+static int dsi_phy_update_mipi_driver_strength(struct dsi_panel *panel, struct msm_dsi_phy *phy)
+{
+	if((panel == NULL) || (phy == NULL))
+	{
+		return 1;
+	}
+
+	phy->cfg.dsi_phy_rescode_top = panel->glbl_rescode_top_ctrl;
+	phy->cfg.dsi_phy_rescode_bot = panel->glbl_rescode_bot_ctrl;
+	return 0;
+
+}
+
 
 static int dsi_display_set_mode_sub(struct dsi_display *display,
 				    struct dsi_display_mode *mode,
@@ -5157,6 +5170,7 @@ static int dsi_display_set_mode_sub(struct dsi_display *display,
 				DSI_ERR("failed to add DSI PHY timing params\n");
 		}
 	}
+	dsi_phy_update_mipi_driver_strength(display->panel, ctrl->phy->cfg)
 error:
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 143ffd80862a..594adca47e9c 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2722,6 +2722,7 @@ error:
 static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 {
 	struct dsi_parser_utils *utils = &panel->utils;
+	int mipi_temp = -1;
 
 	panel->ulps_feature_enabled =
 		utils->read_bool(utils->data, "qcom,ulps-enabled");
@@ -2749,6 +2750,23 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 	panel->reset_config.reset_force_pull_low = of_property_read_bool(utils->data,
 				"qcom,mdss-dsi-reset-force-pull-low");
 
+	if(!(utils->read_u32(utils->data,"qcom,mipi-glbl-rescode-top-ctrl", &mipi_temp)))
+	{
+		panel->glbl_rescode_top_ctrl = mipi_temp;
+	}
+	else
+	{
+		panel->glbl_rescode_top_ctrl = -1;
+	}
+	if(!(utils->read_u32(utils->data,"qcom,mipi-glbl-rescode-bot-ctrl", &mipi_temp)))
+	{
+		panel->glbl_rescode_bot_ctrl = mipi_temp;
+	}
+	else
+	{
+		panel->glbl_rescode_bot_ctrl = -1;
+	}
+
 	return 0;
 }
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index b11d842a9dbd..ef3978bebd26 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -363,6 +363,9 @@ struct dsi_panel {
 
 	enum touch_state tp_state;
 	bool tp_state_check_enable;
+
+	int glbl_rescode_top_ctrl;
+	int glbl_rescode_bot_ctrl;
 };
 
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)
diff --git a/msm/dsi/dsi_phy_hw.h b/msm/dsi/dsi_phy_hw.h
index ef60301f6b08..4d17ee12fdd3 100644
--- a/msm/dsi/dsi_phy_hw.h
+++ b/msm/dsi/dsi_phy_hw.h
@@ -115,6 +115,8 @@ struct dsi_phy_cfg {
 	enum dsi_phy_type phy_type;
 	unsigned long bit_clk_rate_hz;
 	u32 data_lanes;
+	int dsi_phy_rescode_top;
+	int dsi_phy_rescode_bot;
 };
 
 struct dsi_phy_hw;
diff --git a/msm/dsi/dsi_phy_hw_v4_0.c b/msm/dsi/dsi_phy_hw_v4_0.c
index d33eea206452..50f4839dca53 100644
--- a/msm/dsi/dsi_phy_hw_v4_0.c
+++ b/msm/dsi/dsi_phy_hw_v4_0.c
@@ -355,6 +355,14 @@ static void dsi_phy_hw_dphy_enable(struct dsi_phy_hw *phy,
 		vreg_ctrl_0 = less_than_1500_mhz ? 0x53 : 0x52;
 		glbl_rescode_top_ctrl = less_than_1500_mhz ? 0x3d :  0x00;
 		glbl_rescode_bot_ctrl = less_than_1500_mhz ? 0x39 :  0x3c;
+		if(cfg->dsi_phy_rescode_top >= 0)
+		{
+			glbl_rescode_top_ctrl = less_than_1500_mhz ? 0x3d :  cfg->dsi_phy_rescode_top;
+		}
+		if(cfg->dsi_phy_rescode_bot >= 0)
+		{
+			glbl_rescode_bot_ctrl = less_than_1500_mhz ? 0x39 :  cfg->dsi_phy_rescode_bot;
+		}
 		glbl_str_swi_cal_sel_ctrl = 0x00;
 		glbl_hstx_str_ctrl_0 = 0x88;
 	} else {

From f1bbb982b70e2523a6376bcc5ade64e538b4e0b8 Mon Sep 17 00:00:00 2001
From: Jing Hu <hujing3@lenovo.com>
Date: Tue, 18 Jan 2022 01:12:36 -0600
Subject: [PATCH 80/94] Revert "HAWAO+OLED:solve mipi driver strength weak
 problem"

This reverts commit 9ff19f243814c1091716edb5c9c2ffde27c7bb40.
Revert for build break

Change-Id: I3416dcd2de1894e71f501149bbeee6f9b9b9b691
Reviewed-on: https://gerrit.mot.com/2172778
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Wang Wang <wangwang1@lenovo.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c     | 14 --------------
 msm/dsi/dsi_panel.c       | 18 ------------------
 msm/dsi/dsi_panel.h       |  3 ---
 msm/dsi/dsi_phy_hw_v4_0.c |  8 --------
 4 files changed, 43 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 5b0b7df4de87..bae28b81926d 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5031,19 +5031,6 @@ static void dsi_display_validate_dms_fps(struct dsi_display_mode *cur_mode,
 	}
 }
 
-static int dsi_phy_update_mipi_driver_strength(struct dsi_panel *panel, struct msm_dsi_phy *phy)
-{
-	if((panel == NULL) || (phy == NULL))
-	{
-		return 1;
-	}
-
-	phy->cfg.dsi_phy_rescode_top = panel->glbl_rescode_top_ctrl;
-	phy->cfg.dsi_phy_rescode_bot = panel->glbl_rescode_bot_ctrl;
-	return 0;
-
-}
-
 
 static int dsi_display_set_mode_sub(struct dsi_display *display,
 				    struct dsi_display_mode *mode,
@@ -5170,7 +5157,6 @@ static int dsi_display_set_mode_sub(struct dsi_display *display,
 				DSI_ERR("failed to add DSI PHY timing params\n");
 		}
 	}
-	dsi_phy_update_mipi_driver_strength(display->panel, ctrl->phy->cfg)
 error:
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 594adca47e9c..143ffd80862a 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2722,7 +2722,6 @@ error:
 static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 {
 	struct dsi_parser_utils *utils = &panel->utils;
-	int mipi_temp = -1;
 
 	panel->ulps_feature_enabled =
 		utils->read_bool(utils->data, "qcom,ulps-enabled");
@@ -2750,23 +2749,6 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 	panel->reset_config.reset_force_pull_low = of_property_read_bool(utils->data,
 				"qcom,mdss-dsi-reset-force-pull-low");
 
-	if(!(utils->read_u32(utils->data,"qcom,mipi-glbl-rescode-top-ctrl", &mipi_temp)))
-	{
-		panel->glbl_rescode_top_ctrl = mipi_temp;
-	}
-	else
-	{
-		panel->glbl_rescode_top_ctrl = -1;
-	}
-	if(!(utils->read_u32(utils->data,"qcom,mipi-glbl-rescode-bot-ctrl", &mipi_temp)))
-	{
-		panel->glbl_rescode_bot_ctrl = mipi_temp;
-	}
-	else
-	{
-		panel->glbl_rescode_bot_ctrl = -1;
-	}
-
 	return 0;
 }
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index ef3978bebd26..b11d842a9dbd 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -363,9 +363,6 @@ struct dsi_panel {
 
 	enum touch_state tp_state;
 	bool tp_state_check_enable;
-
-	int glbl_rescode_top_ctrl;
-	int glbl_rescode_bot_ctrl;
 };
 
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)
diff --git a/msm/dsi/dsi_phy_hw_v4_0.c b/msm/dsi/dsi_phy_hw_v4_0.c
index 50f4839dca53..d33eea206452 100644
--- a/msm/dsi/dsi_phy_hw_v4_0.c
+++ b/msm/dsi/dsi_phy_hw_v4_0.c
@@ -355,14 +355,6 @@ static void dsi_phy_hw_dphy_enable(struct dsi_phy_hw *phy,
 		vreg_ctrl_0 = less_than_1500_mhz ? 0x53 : 0x52;
 		glbl_rescode_top_ctrl = less_than_1500_mhz ? 0x3d :  0x00;
 		glbl_rescode_bot_ctrl = less_than_1500_mhz ? 0x39 :  0x3c;
-		if(cfg->dsi_phy_rescode_top >= 0)
-		{
-			glbl_rescode_top_ctrl = less_than_1500_mhz ? 0x3d :  cfg->dsi_phy_rescode_top;
-		}
-		if(cfg->dsi_phy_rescode_bot >= 0)
-		{
-			glbl_rescode_bot_ctrl = less_than_1500_mhz ? 0x39 :  cfg->dsi_phy_rescode_bot;
-		}
 		glbl_str_swi_cal_sel_ctrl = 0x00;
 		glbl_hstx_str_ctrl_0 = 0x88;
 	} else {

From 41421dfcc0de68f6d7281bf2c4a06f9ec036ef57 Mon Sep 17 00:00:00 2001
From: tinno18 <tinno18@motorola.com>
Date: Mon, 17 Jan 2022 20:07:14 +0800
Subject: [PATCH 81/94] kernel/display:hawao+oled:change lcm timing

[why] lcm timing sequence is not right
[how] adjust reset sequence
Change-Id: I015027f804c9b1235b4ce9160d771efd8a8b0f8e
Reviewed-on: https://gerrit.mot.com/2171909
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 11 ++++++++++-
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 143ffd80862a..059d1509c977 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -662,10 +662,17 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 		}
 	}
 
+	if (panel->disp_pre_reset && gpio_is_valid(panel->reset_config.reset_gpio) &&
+					!panel->reset_gpio_always_on
+			&& panel->reset_config.reset_force_pull_low) {
+		gpio_set_value(panel->reset_config.reset_gpio, 0);
+		usleep_range(3000, 3000 + 100);
+	}
+
 	if (gpio_is_valid(panel->reset_config.disp_en_gpio))
 		gpio_set_value(panel->reset_config.disp_en_gpio, 0);
 
-	if (gpio_is_valid(panel->reset_config.reset_gpio) &&
+	if (!panel->disp_pre_reset && gpio_is_valid(panel->reset_config.reset_gpio) &&
 					!panel->reset_gpio_always_on
 			&& panel->reset_config.reset_force_pull_low)
 		gpio_set_value(panel->reset_config.reset_gpio, 0);
@@ -2746,6 +2753,8 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 
 	panel->reset_gpio_always_on = utils->read_bool(utils->data,
 			"qcom,platform-reset-gpio-always-on");
+	panel->disp_pre_reset = utils->read_bool(utils->data,
+			"qcom,disp_pre_reset");
 	panel->reset_config.reset_force_pull_low = of_property_read_bool(utils->data,
 				"qcom,mdss-dsi-reset-force-pull-low");
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index b11d842a9dbd..8fa8f29291bb 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -329,6 +329,7 @@ struct dsi_panel {
 	bool ulps_suspend_enabled;
 	bool allow_phy_power_off;
 	bool reset_gpio_always_on;
+	bool disp_pre_reset;
 	atomic_t esd_recovery_pending;
 
 	bool panel_initialized;

From 2e228e5b97da94c58fcbd6c61040c50be7de6979 Mon Sep 17 00:00:00 2001
From: tinno18 <tinno18@motorola.com>
Date: Tue, 18 Jan 2022 19:40:57 +0800
Subject: [PATCH 82/94] HAWAO+OLED: solve mipi driver strength weak problem

- change glbl_rescode_top_ctrl
- change glbl_rescode_bot_ctrl

Change-Id: Icdd92ad0d2ff905cec55b42ad557516c2df58ce0
Reviewed-on: https://gerrit.mot.com/2173463
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jing Hu <hujing3@lenovo.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c     | 14 ++++++++++++++
 msm/dsi/dsi_panel.c       | 18 ++++++++++++++++++
 msm/dsi/dsi_panel.h       |  3 +++
 msm/dsi/dsi_phy_hw_v4_0.c |  8 ++++++++
 4 files changed, 43 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index bae28b81926d..b315be2360c1 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5031,6 +5031,19 @@ static void dsi_display_validate_dms_fps(struct dsi_display_mode *cur_mode,
 	}
 }
 
+static int dsi_phy_update_mipi_driver_strength(struct dsi_panel *panel, struct msm_dsi_phy *phy)
+{
+	if((panel == NULL) || (phy == NULL))
+	{
+		return 1;
+	}
+
+	phy->cfg.dsi_phy_rescode_top = panel->glbl_rescode_top_ctrl;
+	phy->cfg.dsi_phy_rescode_bot = panel->glbl_rescode_bot_ctrl;
+	return 0;
+
+}
+
 
 static int dsi_display_set_mode_sub(struct dsi_display *display,
 				    struct dsi_display_mode *mode,
@@ -5157,6 +5170,7 @@ static int dsi_display_set_mode_sub(struct dsi_display *display,
 				DSI_ERR("failed to add DSI PHY timing params\n");
 		}
 	}
+	dsi_phy_update_mipi_driver_strength(display->panel, ctrl->phy);
 error:
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 059d1509c977..c912f8d671ed 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2729,6 +2729,7 @@ error:
 static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 {
 	struct dsi_parser_utils *utils = &panel->utils;
+	int mipi_temp = -1;
 
 	panel->ulps_feature_enabled =
 		utils->read_bool(utils->data, "qcom,ulps-enabled");
@@ -2758,6 +2759,23 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 	panel->reset_config.reset_force_pull_low = of_property_read_bool(utils->data,
 				"qcom,mdss-dsi-reset-force-pull-low");
 
+	if(!(utils->read_u32(utils->data,"qcom,mipi-glbl-rescode-top-ctrl", &mipi_temp)))
+	{
+		panel->glbl_rescode_top_ctrl = mipi_temp;
+	}
+	else
+	{
+		panel->glbl_rescode_top_ctrl = -1;
+	}
+	if(!(utils->read_u32(utils->data,"qcom,mipi-glbl-rescode-bot-ctrl", &mipi_temp)))
+	{
+		panel->glbl_rescode_bot_ctrl = mipi_temp;
+	}
+	else
+	{
+		panel->glbl_rescode_bot_ctrl = -1;
+	}
+
 	return 0;
 }
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 8fa8f29291bb..0c620948f9d4 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -364,6 +364,9 @@ struct dsi_panel {
 
 	enum touch_state tp_state;
 	bool tp_state_check_enable;
+
+	int glbl_rescode_top_ctrl;
+	int glbl_rescode_bot_ctrl;
 };
 
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)
diff --git a/msm/dsi/dsi_phy_hw_v4_0.c b/msm/dsi/dsi_phy_hw_v4_0.c
index d33eea206452..50f4839dca53 100644
--- a/msm/dsi/dsi_phy_hw_v4_0.c
+++ b/msm/dsi/dsi_phy_hw_v4_0.c
@@ -355,6 +355,14 @@ static void dsi_phy_hw_dphy_enable(struct dsi_phy_hw *phy,
 		vreg_ctrl_0 = less_than_1500_mhz ? 0x53 : 0x52;
 		glbl_rescode_top_ctrl = less_than_1500_mhz ? 0x3d :  0x00;
 		glbl_rescode_bot_ctrl = less_than_1500_mhz ? 0x39 :  0x3c;
+		if(cfg->dsi_phy_rescode_top >= 0)
+		{
+			glbl_rescode_top_ctrl = less_than_1500_mhz ? 0x3d :  cfg->dsi_phy_rescode_top;
+		}
+		if(cfg->dsi_phy_rescode_bot >= 0)
+		{
+			glbl_rescode_bot_ctrl = less_than_1500_mhz ? 0x39 :  cfg->dsi_phy_rescode_bot;
+		}
 		glbl_str_swi_cal_sel_ctrl = 0x00;
 		glbl_hstx_str_ctrl_0 = 0x88;
 	} else {

From 597ccad82931a1059d7674bf42a457b5e02a4a7c Mon Sep 17 00:00:00 2001
From: tinno18 <tinno18@motorola.com>
Date: Thu, 20 Jan 2022 21:50:48 +0800
Subject: [PATCH 83/94] kernel/display:hawao+oled:change lcm timing

hawaii OLED: changed lcm reset and avdd time interval
kernel power on

Change-Id: Ie109a466f226d42eea313ed2bf842dd5a27a058b
Reviewed-on: https://gerrit.mot.com/2175708
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jing Hu <hujing3@lenovo.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 9 +++++++++
 msm/dsi/dsi_panel.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index c912f8d671ed..0364e713c67c 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -542,6 +542,11 @@ int dsi_panel_reset(struct dsi_panel *panel)
 					rc);
 	}
 
+	if(panel->reset_avdd_time_interval > 0)
+	{
+		usleep_range(panel->reset_avdd_time_interval * 1000, (panel->reset_avdd_time_interval * 1000) + 100);
+	}
+
 exit:
 	return rc;
 }
@@ -2776,6 +2781,10 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 		panel->glbl_rescode_bot_ctrl = -1;
 	}
 
+	if(utils->read_u32(utils->data,"qcom,reset-avdd-time-interval", &panel->reset_avdd_time_interval))
+	{
+		panel->reset_avdd_time_interval = 0;
+	}
 	return 0;
 }
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 0c620948f9d4..756260e7b03b 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -367,6 +367,7 @@ struct dsi_panel {
 
 	int glbl_rescode_top_ctrl;
 	int glbl_rescode_bot_ctrl;
+	int reset_avdd_time_interval;
 };
 
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)

From a28e7993ba80b79f81336c6cb6573200c8b3e42a Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Wed, 8 Apr 2020 14:19:27 +0800
Subject: [PATCH 84/94] drm/msm/dsi-staging: add default brightness property

Add a new property to specify the default brightness level that would
set for usecases where no explicit brightness level is configured.
Mot-CRs-fixed: (CR)

Change-Id: Iecc6f4e0b5b9fbda5d8bf97efa7d4de4dbbd5570
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1697641
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
Signed-off-by: tanhua1 <tanhua1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2186536
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
---
 msm/dsi/dsi_panel.c     | 10 +++++++++-
 msm/dsi/dsi_panel.h     |  1 +
 msm/sde/sde_connector.c |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 0364e713c67c..0b1f34aad2e2 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3070,7 +3070,6 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 	panel->bl_config.bl_inverted_dbv = utils->read_bool(utils->data,
 		"qcom,mdss-dsi-bl-inverted-dbv");
 
-
 	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bl-level-align", &val);
 	if (rc) {
 		DSI_DEBUG("[%s] bl_level_align unspecified, defaulting to normal, no special algin\n",
@@ -3080,6 +3079,15 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 		panel->bl_config.bl_level_align = val;
 	}
 
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bl-default-level", &val);
+	if (rc) {
+		panel->bl_config.brightness_default_level =
+			panel->bl_config.brightness_max_level;
+		pr_debug("set default brightness to max level\n");
+	} else {
+		panel->bl_config.brightness_default_level = val;
+	}
+
 	panel->bl_config.bl_2bytes_enable = utils->read_bool(utils->data,
 			"qcom,bklt-dcs-2bytes-enabled");
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 756260e7b03b..f78986972834 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -159,6 +159,7 @@ struct dsi_backlight_config {
 	u32 bl_min_level;
 	u32 bl_max_level;
 	u32 brightness_max_level;
+	u32 brightness_default_level;
 	u32 bl_level;
 	u32 bl_scale;
 	u32 bl_scale_sv;
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 867d04414f6a..a5c1350df2f0 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -152,7 +152,7 @@ static int sde_backlight_setup(struct sde_connector *c_conn,
 	display = (struct dsi_display *) c_conn->display;
 	bl_config = &display->panel->bl_config;
 	props.max_brightness = bl_config->brightness_max_level;
-	props.brightness = bl_config->brightness_max_level;
+	props.brightness = bl_config->brightness_default_level;
 	snprintf(bl_node_name, BL_NODE_NAME_SIZE, "panel%u-backlight",
 							display_count);
 	c_conn->bl_device = backlight_device_register(bl_node_name, dev->dev,

From 4bc5094a0926fa3cd7d9c1be056dae2fe59539a4 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Thu, 17 Feb 2022 14:23:30 +0800
Subject: [PATCH 85/94] drm/dsi_panel: send specific demura command when bl
 change

dsi_panel:
Send specific demura commands when brightness changes.
This is panel IC limitation, it can't change demura parameters
automatically when 51 reg value changes.
porting (CR): 2152146

Change-Id: I042c0d41d68c5400350aeeffef4156fa12e25259
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2193034
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_defs.h  | 14 +++++++++++
 msm/dsi/dsi_panel.c | 61 +++++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  2 ++
 3 files changed, 77 insertions(+)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 4de258eb8730..ba4e5518ada2 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -295,6 +295,13 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_COLOR_STD:                   COLOR STD mode
  * @DSI_CMD_SET_COLOR_GAME :                    COLOR GAME mode
  * @DSI_CMD_SET_COLOR_NONE:                   COLOR NONE mode
+ * @DSI_CMD_SET_BRIGHTNESS_1E:      Send demura codes when brightness changes to 0-1E
+ * @DSI_CMD_SET_BRIGHTNESS_1FD:      Send demura codes when brightness changes to 1F-1FD
+ * @DSI_CMD_SET_BRIGHTNESS_2FF:      Send demura codes when brightness changes to 1FE-2FF
+ * @DSI_CMD_SET_BRIGHTNESS_3FF:      Send demura codes when brightness changes to 300-3FF
+ * @DSI_CMD_SET_BRIGHTNESS_4FF:      Send demura codes when brightness changes to 400-4FF
+ * @DSI_CMD_SET_BRIGHTNESS_5FF:      Send demura codes when brightness changes to 500-5FF
+ * @DSI_CMD_SET_BRIGHTNESS_FFF:      Send demura codes when brightness changes to 600-FFF
  * @DSI_CMD_SET_MAX
  */
 enum dsi_cmd_set_type {
@@ -335,6 +342,13 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_COLOR_STD,
 	DSI_CMD_SET_COLOR_GAME,
 	DSI_CMD_SET_COLOR_NONE,
+	DSI_CMD_SET_BRIGHTNESS_1E,
+	DSI_CMD_SET_BRIGHTNESS_1FD,
+	DSI_CMD_SET_BRIGHTNESS_2FF,
+	DSI_CMD_SET_BRIGHTNESS_3FF,
+	DSI_CMD_SET_BRIGHTNESS_4FF,
+	DSI_CMD_SET_BRIGHTNESS_5FF,
+	DSI_CMD_SET_BRIGHTNESS_FFF,
 	DSI_CMD_SET_MAX
 };
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 0b1f34aad2e2..0687bf9b9b80 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -843,11 +843,14 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	int rc = 0;
 	struct mipi_dsi_device *dsi;
 	struct dsi_backlight_config *bl;
+	u32 bl_lvl_backup;
+	enum dsi_cmd_set_type type;
 
 	if (!panel || (bl_lvl > 0xffff)) {
 		DSI_ERR("invalid params\n");
 		return -EINVAL;
 	}
+	bl_lvl_backup = bl_lvl;
 
 	dsi = &panel->mipi_device;
 	bl = &panel->bl_config;
@@ -868,6 +871,44 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	if (rc < 0)
 		DSI_ERR("failed to update dcs backlight:%d\n", bl_lvl);
 
+	if (bl->bl_demura_cmd) {
+		switch (bl_lvl_backup) {
+			case 0x00 ... 0x1e:
+				type = DSI_CMD_SET_BRIGHTNESS_1E;
+				break;
+			case 0x1f ... 0x1fd:
+				type = DSI_CMD_SET_BRIGHTNESS_1FD;
+				break;
+			case 0x1fe ... 0x2ff:
+				type = DSI_CMD_SET_BRIGHTNESS_2FF;
+				break;
+			case 0x300 ... 0x3ff:
+				type = DSI_CMD_SET_BRIGHTNESS_3FF;
+				break;
+			case 0x400 ... 0x4ff:
+				type = DSI_CMD_SET_BRIGHTNESS_4FF;
+				break;
+			case 0x500 ... 0x5ff:
+				type = DSI_CMD_SET_BRIGHTNESS_5FF;
+				break;
+			case 0x600 ... 0xfff:
+				type = DSI_CMD_SET_BRIGHTNESS_FFF;
+				break;
+			default:
+				type = DSI_CMD_SET_BRIGHTNESS_1E;
+				break;
+		}
+		if (bl->demura_type != type) {
+			DSI_INFO("update dcs backlight:0x%x, demura_type %d, type %d\n", bl_lvl_backup, bl->demura_type, type);
+			rc = dsi_panel_tx_cmd_set(panel, type);
+			if (rc)
+				DSI_ERR("[%s] failed to send DSI_CMD_SET_BRIGHTNESS cmds, rc=%d\n",
+				       panel->name, rc);
+			else
+				bl->demura_type = type;
+		}
+	}
+
 	return rc;
 }
 
@@ -2383,6 +2424,13 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-color-std-command",
 	"qcom,mdss-dsi-color-game-command",
 	"qcom,mdss-dsi-color-none-command",
+	"qcom,mdss-dsi-brightness-1e-command",
+	"qcom,mdss-dsi-brightness-1fd-command",
+	"qcom,mdss-dsi-brightness-2ff-command",
+	"qcom,mdss-dsi-brightness-3ff-command",
+	"qcom,mdss-dsi-brightness-4ff-command",
+	"qcom,mdss-dsi-brightness-5ff-command",
+	"qcom,mdss-dsi-brightness-fff-command",
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -2423,6 +2471,13 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-color-std-command-state",
 	"qcom,mdss-dsi-color-game-command-state",
 	"qcom,mdss-dsi-color-none-command-state",
+	"qcom,mdss-dsi-brightness-1e-command-state",
+	"qcom,mdss-dsi-brightness-1fd-command-state",
+	"qcom,mdss-dsi-brightness-2ff-command-state",
+	"qcom,mdss-dsi-brightness-3ff-command-state",
+	"qcom,mdss-dsi-brightness-4ff-command-state",
+	"qcom,mdss-dsi-brightness-5ff-command-state",
+	"qcom,mdss-dsi-brightness-fff-command-state",
 };
 
 static int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
@@ -3094,6 +3149,12 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 	DSI_INFO("[%s] bl_2bytes_enable=%d\n", panel->name,
 			panel->bl_config.bl_2bytes_enable);
 
+	panel->bl_config.bl_demura_cmd= utils->read_bool(utils->data,
+			"qcom,brightness-demura-command");
+
+	DSI_INFO("[%s] bl_demura_cmd=%d\n", panel->name,
+			panel->bl_config.bl_demura_cmd);
+
 	if (panel->bl_config.type == DSI_BACKLIGHT_PWM) {
 		rc = dsi_panel_parse_bl_pwm_config(panel);
 		if (rc) {
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index f78986972834..77ab367c06be 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -165,6 +165,8 @@ struct dsi_backlight_config {
 	u32 bl_scale_sv;
 	u32 bl_level_align;
 	bool bl_inverted_dbv;
+	bool bl_demura_cmd;
+	u32 demura_type;
 	u32 bl_dcs_subtype;
 
 	int en_gpio;

From bb4aa5b5f17831ab2bacce15624e8d742fd63763 Mon Sep 17 00:00:00 2001
From: Jayaprakash Madisetty <quic_jmadiset@quicinc.com>
Date: Fri, 4 Mar 2022 09:58:36 +0800
Subject: [PATCH 86/94] [PATCH] disp: msm: sde: remove panic from autorefresh
 disable sequence

This change removes panic from autorefresh disable sequence
and adds it during wr_ptr_timeout.

Mot-CRs-fixed: (CR)

Change-Id: If1a7a4d88756fdad104bffca5795211b91a42a2a
Signed-off-by: Jayaprakash Madisetty <quic_jmadiset@quicinc.com>
Reviewed-on: https://gerrit.mot.com/2207000
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Signed-off-by: tanhua1 <tanhua1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2208369
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
---
 msm/sde/sde_encoder_phys_cmd.c | 13 ++++++++++++-
 msm/sde/sde_hw_intf.c          |  3 +++
 msm/sde/sde_hw_mdss.h          |  1 +
 msm/sde_dbg.h                  |  4 ++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/msm/sde/sde_encoder_phys_cmd.c b/msm/sde/sde_encoder_phys_cmd.c
index f9f3873e3d11..67ba03476d7f 100644
--- a/msm/sde/sde_encoder_phys_cmd.c
+++ b/msm/sde/sde_encoder_phys_cmd.c
@@ -675,8 +675,18 @@ static bool _sde_encoder_phys_cmd_is_ongoing_pptx(
 			phys_enc->hw_intf->idx - INTF_0,
 			atomic_read(&phys_enc->pending_kickoff_cnt),
 			info.wr_ptr_line_count,
+			info.intf_frame_count,
+			info.wr_ptr_line_count,
+			info.intf_frame_count,
+			info.intf_line_count,
 			phys_enc->cached_mode.vdisplay);
 
+	pr_err("%s enc:%d pp:%d intf:%d kickoff:%d wr_ptr:%d intf frame:%d int line:%d vdisp:%d\n",
+		__func__, DRMID(phys_enc->parent), phys_enc->hw_pp->idx - PINGPONG_0,
+		phys_enc->hw_intf->idx - INTF_0, atomic_read(&phys_enc->pending_kickoff_cnt),
+		info.wr_ptr_line_count, info.intf_frame_count,
+		info.intf_line_count, phys_enc->cached_mode.vdisplay);
+
 	if (info.wr_ptr_line_count > 0 && info.wr_ptr_line_count <
 			phys_enc->cached_mode.vdisplay)
 		return true;
@@ -1498,6 +1508,8 @@ static int _sde_encoder_phys_cmd_wait_for_wr_ptr(
 
 		ret = frame_pending ? ret : 0;
 
+		SDE_DBG_DUMP("all", "dbg_bus", "vbif_dbg_bus", "panic");
+
 		/*
 		 * There can be few cases of ESD where CTL_START is cleared but
 		 * wr_ptr irq doesn't come. Signaling retire fence in these
@@ -1826,7 +1838,6 @@ static void _sde_encoder_autorefresh_disable_seq2(
 			> AUTOREFRESH_SEQ2_POLL_TIMEOUT) {
 			SDE_ERROR_CMDENC(cmd_enc,
 					"disable autorefresh failed\n");
-			SDE_DBG_DUMP("all", "dbg_bus", "vbif_dbg_bus", "panic");
 			break;
 		}
 
diff --git a/msm/sde/sde_hw_intf.c b/msm/sde/sde_hw_intf.c
index f6ac49701657..8b72244f99b1 100644
--- a/msm/sde/sde_hw_intf.c
+++ b/msm/sde/sde_hw_intf.c
@@ -633,6 +633,9 @@ static int sde_hw_intf_get_vsync_info(struct sde_hw_intf *intf,
 	val = SDE_REG_READ(c, INTF_FRAME_COUNT);
 	info->intf_frame_count = val;
 
+	val = SDE_REG_READ(c, INTF_LINE_COUNT) & 0xffff;
+	info->intf_line_count = val;
+
 	return 0;
 }
 
diff --git a/msm/sde/sde_hw_mdss.h b/msm/sde/sde_hw_mdss.h
index 15f0b91d3c2a..774c3b4f42c0 100644
--- a/msm/sde/sde_hw_mdss.h
+++ b/msm/sde/sde_hw_mdss.h
@@ -697,6 +697,7 @@ struct sde_hw_pp_vsync_info {
 	u32 rd_ptr_line_count;
 	u32 wr_ptr_line_count;
 	u32 intf_frame_count;
+	u32 intf_line_count;
 };
 
 #endif  /* _SDE_HW_MDSS_H */
diff --git a/msm/sde_dbg.h b/msm/sde_dbg.h
index 333260e9cd2b..be534099fdb1 100644
--- a/msm/sde_dbg.h
+++ b/msm/sde_dbg.h
@@ -86,7 +86,7 @@ enum sde_dbg_dump_context {
  * sysfs node or panic. This prevents kernel log from evtlog message
  * flood.
  */
-#define SDE_EVTLOG_PRINT_ENTRY	256
+#define SDE_EVTLOG_PRINT_ENTRY	512
 
 /*
  * evtlog keeps this number of entries in memory for debug purpose. This
@@ -137,7 +137,7 @@ extern struct sde_dbg_evtlog *sde_dbg_base_evtlog;
  * number must be greater than number of possible writes in at least one
  * single commit.
  */
-#define SDE_REGLOG_ENTRY 1024
+#define SDE_REGLOG_ENTRY 2048
 
 struct sde_dbg_reglog_log {
 	s64 time;

From 6f5a1b70a98385780e27790e529de54cd7adb44c Mon Sep 17 00:00:00 2001
From: Srihitha Tangudu <quic_tangudu@quicinc.com>
Date: Mon, 10 Jan 2022 18:36:25 +0530
Subject: [PATCH 87/94] disp: msm: sde: while timing engine enabling poll for
 active region

DCS commands triggered right after timing engine enable can conflict
with blanking period causing command transfer failures. Right after
timing engine enable poll for frame start and line count reaching
active region of display before any DCS commands.

Moto-CRs-Fixed: (CR)

Change-Id: Ia3967e01c3bb5bc82aa3549c300fa8335e00210c
Signed-off-by: Prabhanjan Kandula <quic_pkandula@quicinc.com>
Signed-off-by: Srihitha Tangudu <quic_tangudu@quicinc.com>
Reviewed-on: https://gerrit.mot.com/2222756
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key

From c1beca1c73a44532e4797e3c534eb04da92c2168 Mon Sep 17 00:00:00 2001
From: Srihitha Tangudu <quic_tangudu@quicinc.com>
Date: Sat, 22 Jan 2022 23:12:44 +0530
Subject: [PATCH 88/94] disp: msm: dsi: Only enable lanes required during phy
 enable

Currently we are enabling all the lanes irrespective of the
lanes we are actually going to use. Add support to enable
only those lanes that are required and thus save power.

Moto-CRs-Fixed: (CR)

Change-Id: I9aae76eeaa05a79337d4e4b1f2e36ea9842bd580
Signed-off-by: Srihitha Tangudu <quic_tangudu@quicinc.com>
Reviewed-on: https://gerrit.mot.com/2222757
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key

From 5cd998bd4bc104ac45baf262058db8016a443c46 Mon Sep 17 00:00:00 2001
From: Mahadevan <quic_mahap@quicinc.com>
Date: Mon, 24 Jan 2022 20:20:27 +0530
Subject: [PATCH 89/94] disp: msm: avoid BW down vote after splash memory
 release

In RSC disabled targets during display bootup with continuous
splash constant ab and ib votes are set. Upon issuing first
commit these values gets updated and at the end of first commit
on release of splash resource the votes are removed using
sde_power_data_bus_set_quota API. On the very next commit if
bandwidth is changed from previous commit, new BW voting is
reflected else the disable splash vote exists and underruns are
seen. This patch removes the downvote and fixes the underruns
seen in video mode in targets for which rsc is disabled.

Moto-CRs-Fixed: (CR)

Change-Id: I628d426ad11c703dd972be89fa998588c53a57bb
Signed-off-by: Mahadevan <quic_mahap@quicinc.com>
Reviewed-on: https://gerrit.mot.com/2222758
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key

From 1cfd186d3a0bc9ca3c5b619a81dd1f289965e4ad Mon Sep 17 00:00:00 2001
From: Andhavarapu Karthik <quic_kartkart@quicinc.com>
Date: Mon, 10 Jan 2022 12:33:39 +0530
Subject: [PATCH 90/94] disp: msm: sde: fix RM poll timeouts during PM
 suspend/resume usecase

When PM resume commit occurs with mode_changed, enable flag set and
active_changed flag not set, the RM reservation allocated is not cleared
during crtc_destroy_state as encoder_mask in old_crtc_state is NULL.
When there is resume commit from HAL, it polls for this pending reservation
to be cleared causing poll timeouts. This change releases the pending
reservation from the crtc->state->encoder mask, as the old_crtc_state
encoder_mask will be reset with default values at start of PM resume.

Moto-CRs-Fixed: (CR)

Change-Id: Ica1c90a6ea7ef7df08fcb976b6f1b54bbfeea357
Signed-off-by: Andhavarapu Karth(CR) <quic_kartkart@quicinc.com>
Reviewed-on: https://gerrit.mot.com/2221145
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/sde/sde_crtc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c
index 602476ba8a4a..c44e1644cf55 100644
--- a/msm/sde/sde_crtc.c
+++ b/msm/sde/sde_crtc.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
  * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (C) 2013 Red Hat
@@ -3377,6 +3378,7 @@ static void sde_crtc_destroy_state(struct drm_crtc *crtc,
 	struct sde_crtc_state *cstate;
 	struct drm_encoder *enc;
 	struct sde_kms *sde_kms;
+	u32 encoder_mask;
 
 	if (!crtc || !state) {
 		SDE_ERROR("invalid argument(s)\n");
@@ -3392,9 +3394,11 @@ static void sde_crtc_destroy_state(struct drm_crtc *crtc,
 		return;
 	}
 
-	SDE_DEBUG("crtc%d\n", crtc->base.id);
+	encoder_mask = state->encoder_mask ? state->encoder_mask :
+				crtc->state->encoder_mask;
+	SDE_DEBUG("crtc%d\n, encoder_mask=%d", crtc->base.id, encoder_mask);
 
-	drm_for_each_encoder_mask(enc, crtc->dev, state->encoder_mask)
+	drm_for_each_encoder_mask(enc, crtc->dev, encoder_mask)
 		sde_rm_release(&sde_kms->rm, enc, true);
 
 	__drm_atomic_helper_crtc_destroy_state(state);

From 93ce33b50af71c25e7454dfeda70101e97efd544 Mon Sep 17 00:00:00 2001
From: liujg6 <liujg6@lenovo.com>
Date: Mon, 28 Mar 2022 10:27:20 +0800
Subject: [PATCH 91/94] disp: msm: use vzalloc for large allocations

Large allocations using kzalloc can lead to timeouts. This updates
the allocation calls accordingly to use vzalloc to remove
requirements on contiguous memory.

Mot-CRs-fixed: (CR)

Change-Id: I86fa0ae13277d97477210a082703514df792d8a9
Signed-off-by: Nilaan Gunabalachandran <quic_ngunabal@quicinc.com>
Reviewed-on: https://gerrit.mot.com/2227151
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Zhangqing Huang <huangzq2@motorola.com>
Reviewed-by: Wang Wang <wangwang1@lenovo.com>
Submit-Approved: Jira Key
---
 msm/sde/sde_hw_reg_dma_v1_color_proc.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/msm/sde/sde_hw_reg_dma_v1_color_proc.c b/msm/sde/sde_hw_reg_dma_v1_color_proc.c
index 54629ab004fd..4d40186d63d1 100644
--- a/msm/sde/sde_hw_reg_dma_v1_color_proc.c
+++ b/msm/sde/sde_hw_reg_dma_v1_color_proc.c
@@ -490,7 +490,7 @@ void reg_dmav1_setup_dspp_vlutv18(struct sde_hw_dspp *ctx, void *cfg)
 		return;
 	}
 
-	data = kzalloc(VLUT_LEN, GFP_KERNEL);
+	data = vzalloc(VLUT_LEN);
 	if (!data)
 		return;
 
@@ -537,7 +537,7 @@ void reg_dmav1_setup_dspp_vlutv18(struct sde_hw_dspp *ctx, void *cfg)
 	}
 
 exit:
-	kfree(data);
+	vfree(data);
 	/* update flush bit */
 	if (!rc && ctl && ctl->ops.update_bitmask_dspp_pavlut) {
 		int dspp_idx;
@@ -1152,7 +1152,7 @@ int reg_dmav1_setup_rc_datav1(struct sde_hw_dspp *ctx, void *cfg)
 	}
 
 	DRM_DEBUG_DRIVER("allocating %u bytes of memory for dma\n", buf_sz);
-	data = kzalloc(buf_sz, GFP_KERNEL);
+	data = vzalloc(buf_sz);
 	if (!data) {
 		DRM_ERROR("memory allocation failed ret %d\n", rc);
 		return -ENOMEM;
@@ -1188,7 +1188,7 @@ int reg_dmav1_setup_rc_datav1(struct sde_hw_dspp *ctx, void *cfg)
 	}
 
 exit:
-	kfree(data);
+	vfree(data);
 	return rc;
 }
 
@@ -1291,7 +1291,7 @@ void reg_dmav1_setup_dspp_pccv4(struct sde_hw_dspp *ctx, void *cfg)
 		return;
 	}
 
-	data = kzalloc(PCC_LEN, GFP_KERNEL);
+	data = vzalloc(PCC_LEN);
 	if (!data)
 		return;
 
@@ -1357,7 +1357,7 @@ void reg_dmav1_setup_dspp_pccv4(struct sde_hw_dspp *ctx, void *cfg)
 		DRM_ERROR("failed to kick off ret %d\n", rc);
 
 exit:
-	kfree(data);
+	vfree(data);
 }
 
 void reg_dmav1_setup_dspp_pa_hsicv17(struct sde_hw_dspp *ctx, void *cfg)
@@ -2333,7 +2333,7 @@ static int reg_dmav1_setup_vig_igc_common(struct sde_hw_reg_dma_ops *dma_ops,
 				hw_cfg->len, sizeof(struct drm_msm_igc_lut));
 	}
 
-	data = kzalloc(VIG_1D_LUT_IGC_LEN * sizeof(u32), GFP_KERNEL);
+	data = vzalloc(VIG_1D_LUT_IGC_LEN * sizeof(u32));
 	if (!data)
 		return -ENOMEM;
 
@@ -2395,7 +2395,7 @@ static int reg_dmav1_setup_vig_igc_common(struct sde_hw_reg_dma_ops *dma_ops,
 	if (rc)
 		DRM_ERROR("setting opcode failed ret %d\n", rc);
 exit:
-	kfree(data);
+	vfree(data);
 	return rc;
 }
 
@@ -2597,7 +2597,7 @@ void reg_dmav1_setup_dma_igcv5(struct sde_hw_pipe *ctx, void *cfg,
 		return;
 	}
 
-	data = kzalloc(DMA_1D_LUT_IGC_LEN * sizeof(u32), GFP_KERNEL);
+	data = vzalloc(DMA_1D_LUT_IGC_LEN * sizeof(u32));
 	if (!data) {
 		DRM_ERROR("failed to allocate memory for igc\n");
 		return;
@@ -2658,7 +2658,7 @@ void reg_dmav1_setup_dma_igcv5(struct sde_hw_pipe *ctx, void *cfg,
 	if (rc)
 		DRM_ERROR("failed to kick off ret %d\n", rc);
 igc_exit:
-	kfree(data);
+	vfree(data);
 }
 
 static void dma_gcv5_off(struct sde_hw_pipe *ctx, void *cfg,

From ac5c4baebe8da43b84d9a52c22aa67f737e3f482 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Sun, 24 Apr 2022 10:53:26 +0800
Subject: [PATCH 92/94] disp/msm/dsi:support to config glbl_hstx_str_ctrl_0 for
 mipi driver strength

devon: mipi driver strength update
support to config glbl_hstx_str_ctrl_0

Change-Id: I108d7243a08e571df3c7ca3b92611ea831e19e8b
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2251094
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c     | 1 +
 msm/dsi/dsi_panel.c       | 9 +++++++++
 msm/dsi/dsi_panel.h       | 1 +
 msm/dsi/dsi_phy_hw.h      | 1 +
 msm/dsi/dsi_phy_hw_v4_0.c | 5 +++++
 5 files changed, 17 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index b315be2360c1..f4ffa19cbdb4 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5040,6 +5040,7 @@ static int dsi_phy_update_mipi_driver_strength(struct dsi_panel *panel, struct m
 
 	phy->cfg.dsi_phy_rescode_top = panel->glbl_rescode_top_ctrl;
 	phy->cfg.dsi_phy_rescode_bot = panel->glbl_rescode_bot_ctrl;
+	phy->cfg.dsi_phy_hstx_str_ctrl_0 = panel->glbl_hstx_str_ctrl_0;
 	return 0;
 
 }
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 0687bf9b9b80..13c262dfbf4c 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2836,6 +2836,15 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 		panel->glbl_rescode_bot_ctrl = -1;
 	}
 
+	if(!(utils->read_u32(utils->data,"qcom,mipi-glbl-hstx-str-ctrl-0", &mipi_temp)))
+	{
+		panel->glbl_hstx_str_ctrl_0 = mipi_temp;
+	}
+	else
+	{
+		panel->glbl_hstx_str_ctrl_0 = -1;
+	}
+
 	if(utils->read_u32(utils->data,"qcom,reset-avdd-time-interval", &panel->reset_avdd_time_interval))
 	{
 		panel->reset_avdd_time_interval = 0;
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 77ab367c06be..b7d08c4c7321 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -370,6 +370,7 @@ struct dsi_panel {
 
 	int glbl_rescode_top_ctrl;
 	int glbl_rescode_bot_ctrl;
+	int glbl_hstx_str_ctrl_0;
 	int reset_avdd_time_interval;
 };
 
diff --git a/msm/dsi/dsi_phy_hw.h b/msm/dsi/dsi_phy_hw.h
index 4d17ee12fdd3..2ba74b71946f 100644
--- a/msm/dsi/dsi_phy_hw.h
+++ b/msm/dsi/dsi_phy_hw.h
@@ -117,6 +117,7 @@ struct dsi_phy_cfg {
 	u32 data_lanes;
 	int dsi_phy_rescode_top;
 	int dsi_phy_rescode_bot;
+	int dsi_phy_hstx_str_ctrl_0;
 };
 
 struct dsi_phy_hw;
diff --git a/msm/dsi/dsi_phy_hw_v4_0.c b/msm/dsi/dsi_phy_hw_v4_0.c
index 50f4839dca53..620d6310533f 100644
--- a/msm/dsi/dsi_phy_hw_v4_0.c
+++ b/msm/dsi/dsi_phy_hw_v4_0.c
@@ -365,6 +365,11 @@ static void dsi_phy_hw_dphy_enable(struct dsi_phy_hw *phy,
 		}
 		glbl_str_swi_cal_sel_ctrl = 0x00;
 		glbl_hstx_str_ctrl_0 = 0x88;
+		if(cfg->dsi_phy_hstx_str_ctrl_0 > 0)
+		{
+			glbl_hstx_str_ctrl_0 = cfg->dsi_phy_hstx_str_ctrl_0;
+			DSI_PHY_INFO(phy, "glbl_hstx_str_ctrl_0=0x%2x\n", glbl_hstx_str_ctrl_0);
+		}
 	} else {
 		vreg_ctrl_0 = less_than_1500_mhz ? 0x5B : 0x59;
 		glbl_str_swi_cal_sel_ctrl = less_than_1500_mhz ? 0x03 : 0x00;

From 15dc74b3d30315ef1697306268a3beb2cc166647 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Sun, 24 Apr 2022 18:06:29 +0800
Subject: [PATCH 93/94] disp/msm/dsi:enabel ESD te check for video panel

some video panel need use ESD TE check
remove panel mode check to enable ESD TE check for video panel too
make sure the configed GPIO TE sinal is for display only
Qcom ODM case 05196237

Change-Id: I59d0e79c7e4da9820f9344a107409774cf829c32
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2251490
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 13c262dfbf4c..bb39f5a291bd 100755
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -4049,6 +4049,9 @@ static int dsi_panel_parse_esd_config(struct dsi_panel *panel)
 			esd_config->status_mode = ESD_MODE_REG_READ;
 		} else if (!strcmp(string, "te_signal_check_video")) {
 			esd_config->status_mode = ESD_MODE_PANEL_TE_VIDEO;
+		} else if (!strcmp(string, "te_signal_check_vdo")) {
+			//some video mode need esd te check
+			esd_config->status_mode = ESD_MODE_PANEL_TE;
 		} else if (!strcmp(string, "te_signal_check")) {
 			if (panel->panel_mode == DSI_OP_CMD_MODE) {
 				esd_config->status_mode = ESD_MODE_PANEL_TE;

From a3134d05045a7fb5b57ced851a170a08215aad38 Mon Sep 17 00:00:00 2001
From: Claudio dos Santos Junior <claudioj@motorola.com>
Date: Mon, 14 Aug 2023 11:52:06 -0300
Subject: [PATCH 94/94] Revert "disp: msm: use vzalloc for large allocations"

PROPAGATED_from (CR)

Improper changed to vzmalloc might result in memory corruption
of user space.

This reverts commit 4de35d5a1dfb4230aa19483d7da9d3724f5097a0.

Change-Id: Ic197da311d37062e92cada32d300c3b157551bce
Signed-off-by: Claudio dos Santos Junior <claudioj@motorola.com>
Reviewed-on: https://gerrit.mot.com/2709185
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Bruno Oliveira <brunosoe@motorola.com>
Reviewed-by: Carlos Pinho <cpinho@motorola.com>
Submit-Approved: Jira Key
---
 msm/sde_dbg.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/msm/sde_dbg.c b/msm/sde_dbg.c
index 04037d5c5f20..72b5d89bb80d 100644
--- a/msm/sde_dbg.c
+++ b/msm/sde_dbg.c
@@ -3254,6 +3254,7 @@ static void _sde_dbg_dump_sde_dbg_bus(struct sde_dbg_sde_debug_bus *bus)
 	u32 *dump_addr = NULL;
 	u32 status = 0;
 	struct sde_debug_bus_entry *head;
+	phys_addr_t phys = 0;
 	int list_size;
 	int i;
 	u32 offset;
@@ -3291,7 +3292,8 @@ static void _sde_dbg_dump_sde_dbg_bus(struct sde_dbg_sde_debug_bus *bus)
 
 	if (in_mem) {
 		if (!(*dump_mem))
-			*dump_mem =  vzalloc(list_size);
+			*dump_mem = dma_alloc_coherent(sde_dbg_base.dev,
+				list_size, &phys, GFP_KERNEL);
 
 		if (*dump_mem) {
 			dump_addr = *dump_mem;
@@ -3401,6 +3403,7 @@ static void _sde_dbg_dump_vbif_dbg_bus(struct sde_dbg_vbif_debug_bus *bus)
 	u32 value, d0, d1;
 	unsigned long reg, reg1, reg2;
 	struct vbif_debug_bus_entry *head;
+	phys_addr_t phys = 0;
 	int i, list_size = 0;
 	void __iomem *mem_base = NULL;
 	struct vbif_debug_bus_entry *dbg_bus;
@@ -3450,7 +3453,8 @@ static void _sde_dbg_dump_vbif_dbg_bus(struct sde_dbg_vbif_debug_bus *bus)
 
 	if (in_mem) {
 		if (!(*dump_mem))
-			*dump_mem =  vzalloc(list_size);
+			*dump_mem = dma_alloc_coherent(sde_dbg_base.dev,
+				list_size, &phys, GFP_KERNEL);
 
 		if (*dump_mem) {
 			dump_addr = *dump_mem;
@@ -3541,12 +3545,14 @@ static void _sde_dump_array(struct sde_dbg_reg_base *blk_arr[],
 	int i;
 	u32 reg_dump_size;
 	struct sde_dbg_base *dbg_base = &sde_dbg_base;
+	phys_addr_t phys = 0;
 
 	mutex_lock(&sde_dbg_base.mutex);
 
 	reg_dump_size =  _sde_dbg_get_reg_dump_size();
 	if (!dbg_base->reg_dump_base)
-		dbg_base->reg_dump_base = vzalloc(reg_dump_size);
+		dbg_base->reg_dump_base = dma_alloc_coherent(sde_dbg_base.dev,
+			reg_dump_size, &phys, GFP_KERNEL);
 
 	dbg_base->reg_dump_addr =  dbg_base->reg_dump_base;
 
@@ -4785,7 +4791,6 @@ static void sde_dbg_reg_base_destroy(void)
 		list_del(&blk_base->reg_base_head);
 		kfree(blk_base);
 	}
-	vfree(dbg_base->reg_dump_base);
 }
 
 static void sde_dbg_buses_destroy(void)