From abab94fffe6ae4e52c29251778832ceb5e404696 Mon Sep 17 00:00:00 2001
From: Ritesh Kumar <riteshk@codeaurora.org>
Date: Fri, 14 Aug 2020 15:36:23 +0530
Subject: [PATCH 001/116] [DNM]: Hack for Touch Bring Up

Hack for Touch Bring Up. This is to handle the case when
touch probe happens before display panel is bind.
This will not be needed once splash is up.

Change-Id: I95a7e2983e77c0bf82c670ec7502b4198e8e3afa
Signed-off-by: Ritesh Kumar <riteshk@codeaurora.org>
---
 msm/dsi/dsi_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index d7dd2e1cebac..7435f2ecec18 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5644,7 +5644,7 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 		if (!panel_node)
 			DSI_WARN("default panel not found\n");
 
-		if (IS_ENABLED(CONFIG_DSI_PARSER) && !display->trusted_vm_env)
+		if (0)
 			firm_req = !request_firmware_nowait(
 				THIS_MODULE, 1, "dsi_prop",
 				&pdev->dev, GFP_KERNEL, display,

From 49745966474b81d940895f00a5ab3927cbc2b1f0 Mon Sep 17 00:00:00 2001
From: Niranjan Reddy Dumbala <dnreddy@codeaurora.org>
Date: Thu, 3 Sep 2020 14:33:01 +0530
Subject: [PATCH 002/116] Revert "[DNM]: Hack for Touch Bring Up"

This reverts commit abab94fffe6ae4e52c29251778832ceb5e404696.

Change-Id: Idd0b2a428e8aae0ca3cb3f575f0d0d237f94c977
---
 msm/dsi/dsi_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 7435f2ecec18..d7dd2e1cebac 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5644,7 +5644,7 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 		if (!panel_node)
 			DSI_WARN("default panel not found\n");
 
-		if (0)
+		if (IS_ENABLED(CONFIG_DSI_PARSER) && !display->trusted_vm_env)
 			firm_req = !request_firmware_nowait(
 				THIS_MODULE, 1, "dsi_prop",
 				&pdev->dev, GFP_KERNEL, display,

From c0c1d57d69eda3c8f0fa3f1d822152d33fd9c0de Mon Sep 17 00:00:00 2001
From: Rajeev Nandan <rajeevny@codeaurora.org>
Date: Thu, 17 Sep 2020 13:45:34 +0530
Subject: [PATCH 003/116] disp: msm: sde: fix panel early event blank notifier
 call

If trusted vm is disabled, the DRM_PANEL_EARLY_EVENT_BLANK
notifier does not get called because of this touch early
suspend does not happen which leads to continuous touch
i2c transfer failure during suspend.

Change-Id: I6abaacb9f8343eec24d5642f7eda9e7c410fd8b7
Signed-off-by: Rajeev Nandan <rajeevny@codeaurora.org>
---
 msm/sde/sde_kms.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c
index 537ae164d78c..4c97812d23d5 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -1165,10 +1165,12 @@ static void sde_kms_prepare_commit(struct msm_kms *kms,
 
 	vm_ops = sde_vm_get_ops(sde_kms);
 	if (!vm_ops)
-		goto end;
+		goto end_vm;
 
 	if (vm_ops->vm_prepare_commit)
 		vm_ops->vm_prepare_commit(sde_kms, state);
+
+end_vm:
 	_sde_kms_drm_check_dpms(state, DRM_PANEL_EARLY_EVENT_BLANK);
 end:
 	SDE_ATRACE_END("prepare_commit");

From 545d81b94c3dce8adb6d0fe4fb26158f78a19cb3 Mon Sep 17 00:00:00 2001
From: Ritesh Kumar <riteshk@codeaurora.org>
Date: Thu, 8 Oct 2020 17:28:45 +0530
Subject: [PATCH 004/116] Revert "disp: msm: dsi: Panic on getting continuous
 ESD check failures"

This reverts commit 93fa9bdf60a311fea9acb4973f034a3a85d31880.

Change-Id: Ia29c690202d53207377fad9117199d9c024a33cf
Signed-off-by: Ritesh Kumar <riteshk@codeaurora.org>
---
 msm/dsi/dsi_display.h   |  3 ---
 msm/sde/sde_connector.c | 30 +-----------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index 9b4da4063ddd..7406d7829559 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -184,7 +184,6 @@ struct dsi_display_ext_bridge {
  * @misr_frame_count  Number of frames to accumulate the MISR value
  * @esd_trigger       field indicating ESD trigger through debugfs
  * @poms_te_work      POMS delayed work for disabling panel TE
- * @esd_fail_count    Count of continuous ESD check failures
  * @te_source         vsync source pin information
  * @clk_gating_config Clocks for which clock gating needs to be enabled
  * @queue_cmd_waits   Indicates if wait for dma commands done has to be queued.
@@ -278,8 +277,6 @@ struct dsi_display {
 
 	struct dsi_display_boot_param *boot_disp;
 
-	u32 esd_fail_count;
-
 	u32 te_source;
 	u32 clk_gating_config;
 	bool queue_cmd_waits;
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index e0e31655af50..84e2d5b89131 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -2380,8 +2380,6 @@ static void _sde_connector_report_panel_dead(struct sde_connector *conn,
 	bool skip_pre_kickoff)
 {
 	struct drm_event event;
-	struct dsi_display *display;
-	u32 const max_conseq_esd_fail_count = 5;
 
 	if (!conn)
 		return;
@@ -2405,17 +2403,6 @@ static void _sde_connector_report_panel_dead(struct sde_connector *conn,
 		conn->base.dev, &event, (u8 *)&conn->panel_dead);
 	SDE_ERROR("esd check failed report PANEL_DEAD conn_id: %d enc_id: %d\n",
 			conn->base.base.id, conn->encoder->base.id);
-
-	if (conn->connector_type != DRM_MODE_CONNECTOR_DSI)
-		return;
-
-	display = (struct dsi_display *)conn->display;
-	display->esd_fail_count++;
-	if (display->esd_fail_count == max_conseq_esd_fail_count) {
-		SDE_ERROR("Triggered reset on multiple PANEL_DEAD instances\n");
-		SDE_DBG_DUMP("all", "dbg_bus", "dsi_dbg_bus",
-			"vbif_dbg_bus", "panic");
-	}
 }
 
 int sde_connector_esd_status(struct drm_connector *conn)
@@ -2453,16 +2440,8 @@ int sde_connector_esd_status(struct drm_connector *conn)
 		SDE_DEBUG("Successfully received TE from panel\n");
 		ret = 0;
 	}
-
-	if (sde_conn->connector_type == DRM_MODE_CONNECTOR_DSI) {
-		/* Reset esd_fail_count on recovery */
-		if (!ret)
-			display->esd_fail_count = 0;
-		SDE_EVT32(ret, display->esd_fail_count);
-		return ret;
-	}
-
 	SDE_EVT32(ret);
+
 	return ret;
 }
 
@@ -2471,7 +2450,6 @@ static void sde_connector_check_status_work(struct work_struct *work)
 	struct sde_connector *conn;
 	int rc = 0;
 	struct device *dev;
-	struct dsi_display *display;
 
 	conn = container_of(to_delayed_work(work),
 			struct sde_connector, status_work);
@@ -2504,12 +2482,6 @@ static void sde_connector_check_status_work(struct work_struct *work)
 			conn->esd_status_interval : STATUS_CHECK_INTERVAL_MS;
 		schedule_delayed_work(&conn->status_work,
 			msecs_to_jiffies(interval));
-
-		/* Successful ESD check */
-		if (conn->connector_type == DRM_MODE_CONNECTOR_DSI) {
-			display = conn->display;
-			display->esd_fail_count = 0;
-		}
 		return;
 	}
 

From e428f0adfb459c589b9aac95fa17d29823540119 Mon Sep 17 00:00:00 2001
From: Steve Cohen <cohens@codeaurora.org>
Date: Wed, 11 Nov 2020 14:37:10 -0500
Subject: [PATCH 005/116] disp: msm: sde: cache encoder_mask for vblank_work

There is a race between disable commit swap-state on display
thread and vblank work on event thread which may skip applying
the vblank vote if the encoder_mask has already been cleared.
To avoid the race, use a cached encoder_mask that is gauranteed
to be valid between the vblank_on and vblank_off calls.

Also, vblank queue work is initializing a variable that's never
used and msm_disable_outputs has 2 instances of pointers to old
CRTC state. Remove this dead code.

Change-Id: I5e4a482b8f067e272a2aef5afa08cc0e1ab89434
Signed-off-by: Steve Cohen <cohens@codeaurora.org>
---
 msm/msm_atomic.c   |  1 -
 msm/msm_drv.c      |  3 ---
 msm/sde/sde_crtc.c | 42 +++++++++++++++++++++---------------------
 msm/sde/sde_crtc.h |  2 ++
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/msm/msm_atomic.c b/msm/msm_atomic.c
index 56dff6b2893e..6bddb33d9824 100644
--- a/msm/msm_atomic.c
+++ b/msm/msm_atomic.c
@@ -156,7 +156,6 @@ msm_disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
 			old_conn_state, i) {
 		const struct drm_encoder_helper_funcs *funcs;
 		struct drm_encoder *encoder;
-		struct drm_crtc_state *old_crtc_state;
 
 		/*
 		 * Shut down everything that's in the changeset and currently
diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index 2c582ef0f0ff..180b4662635d 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -366,7 +366,6 @@ static int vblank_ctrl_queue_work(struct msm_drm_private *priv,
 					int crtc_id, bool enable)
 {
 	struct vblank_work *cur_work;
-	struct drm_crtc *crtc;
 	struct kthread_worker *worker;
 
 	if (!priv || crtc_id >= priv->num_crtcs)
@@ -376,8 +375,6 @@ static int vblank_ctrl_queue_work(struct msm_drm_private *priv,
 	if (!cur_work)
 		return -ENOMEM;
 
-	crtc = priv->crtcs[crtc_id];
-
 	kthread_init_work(&cur_work->work, vblank_ctrl_worker);
 	cur_work->crtc_id = crtc_id;
 	cur_work->enable = enable;
diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c
index 8eede091eba1..8064b5fee05c 100644
--- a/msm/sde/sde_crtc.c
+++ b/msm/sde/sde_crtc.c
@@ -3823,13 +3823,13 @@ void sde_crtc_commit_kickoff(struct drm_crtc *crtc,
 }
 
 /**
- * _sde_crtc_vblank_enable_no_lock - update power resource and vblank request
+ * _sde_crtc_vblank_enable - update power resource and vblank request
  * @sde_crtc: Pointer to sde crtc structure
  * @enable: Whether to enable/disable vblanks
  *
  * @Return: error code
  */
-static int _sde_crtc_vblank_enable_no_lock(
+static int _sde_crtc_vblank_enable(
 		struct sde_crtc *sde_crtc, bool enable)
 {
 	struct drm_crtc *crtc;
@@ -3841,38 +3841,38 @@ static int _sde_crtc_vblank_enable_no_lock(
 	}
 
 	crtc = &sde_crtc->base;
+	SDE_EVT32(DRMID(crtc), enable, sde_crtc->enabled,
+			crtc->state->encoder_mask,
+			sde_crtc->cached_encoder_mask);
 
 	if (enable) {
 		int ret;
 
-		/* drop lock since power crtc cb may try to re-acquire lock */
-		mutex_unlock(&sde_crtc->crtc_lock);
 		ret = pm_runtime_get_sync(crtc->dev->dev);
-		mutex_lock(&sde_crtc->crtc_lock);
 		if (ret < 0)
 			return ret;
 
+		mutex_lock(&sde_crtc->crtc_lock);
 		drm_for_each_encoder_mask(enc, crtc->dev,
-				crtc->state->encoder_mask) {
-			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,
-					sde_crtc->enabled);
+				sde_crtc->cached_encoder_mask) {
+			SDE_EVT32(DRMID(crtc), DRMID(enc));
 
 			sde_encoder_register_vblank_callback(enc,
 					sde_crtc_vblank_cb, (void *)crtc);
 		}
+
+		mutex_unlock(&sde_crtc->crtc_lock);
 	} else {
+		mutex_lock(&sde_crtc->crtc_lock);
 		drm_for_each_encoder_mask(enc, crtc->dev,
-				crtc->state->encoder_mask) {
-			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,
-					sde_crtc->enabled);
+				sde_crtc->cached_encoder_mask) {
+			SDE_EVT32(DRMID(crtc), DRMID(enc));
 
 			sde_encoder_register_vblank_callback(enc, NULL, NULL);
 		}
 
-		/* drop lock since power crtc cb may try to re-acquire lock */
 		mutex_unlock(&sde_crtc->crtc_lock);
 		pm_runtime_put_sync(crtc->dev->dev);
-		mutex_lock(&sde_crtc->crtc_lock);
 	}
 
 	return 0;
@@ -4168,9 +4168,10 @@ static void sde_crtc_disable(struct drm_crtc *crtc)
 	kthread_cancel_delayed_work_sync(&sde_crtc->static_cache_read_work);
 	kthread_cancel_delayed_work_sync(&sde_crtc->idle_notify_work);
 
-	SDE_EVT32(DRMID(crtc), sde_crtc->enabled,
-			crtc->state->active, crtc->state->enable);
+	SDE_EVT32(DRMID(crtc), sde_crtc->enabled, crtc->state->active,
+			crtc->state->enable, sde_crtc->cached_encoder_mask);
 	sde_crtc->enabled = false;
+	sde_crtc->cached_encoder_mask = 0;
 
 	/* Try to disable uidle */
 	sde_core_perf_crtc_update_uidle(crtc, false);
@@ -4279,8 +4280,11 @@ static void sde_crtc_enable(struct drm_crtc *crtc,
 	 * Avoid drm_crtc_vblank_on during seamless DMS case
 	 * when CRTC is already in enabled state
 	 */
-	if (!sde_crtc->enabled)
+	if (!sde_crtc->enabled) {
+		/* cache the encoder mask now for vblank work */
+		sde_crtc->cached_encoder_mask = crtc->state->encoder_mask;
 		drm_crtc_vblank_on(crtc);
+	}
 
 	mutex_lock(&sde_crtc->crtc_lock);
 	SDE_EVT32(DRMID(crtc), sde_crtc->enabled);
@@ -5119,15 +5123,11 @@ int sde_crtc_vblank(struct drm_crtc *crtc, bool en)
 	}
 	sde_crtc = to_sde_crtc(crtc);
 
-	mutex_lock(&sde_crtc->crtc_lock);
-	SDE_EVT32(DRMID(&sde_crtc->base), en, sde_crtc->enabled);
-	ret = _sde_crtc_vblank_enable_no_lock(sde_crtc, en);
+	ret = _sde_crtc_vblank_enable(sde_crtc, en);
 	if (ret)
 		SDE_ERROR("%s vblank enable failed: %d\n",
 				sde_crtc->name, ret);
 
-	mutex_unlock(&sde_crtc->crtc_lock);
-
 	return 0;
 }
 
diff --git a/msm/sde/sde_crtc.h b/msm/sde/sde_crtc.h
index 41ca11bb97ea..f4efaac5578d 100644
--- a/msm/sde/sde_crtc.h
+++ b/msm/sde/sde_crtc.h
@@ -291,6 +291,7 @@ struct sde_crtc_misr_info {
  * @static_cache_read_work: delayed worker to transition cache state to read
  * @cache_state     : Current static image cache state
  * @dspp_blob_info  : blob containing dspp hw capability information
+ * @cached_encoder_mask : cached encoder_mask for vblank work
  */
 struct sde_crtc {
 	struct drm_crtc base;
@@ -381,6 +382,7 @@ struct sde_crtc {
 	enum sde_crtc_cache_state cache_state;
 
 	struct drm_property_blob *dspp_blob_info;
+	u32 cached_encoder_mask;
 };
 
 enum sde_crtc_dirty_flags {

From 7c00a10c4c9cc0e3c12f80751ac3e4f46c4d275b Mon Sep 17 00:00:00 2001
From: Jayaprakash <jmadiset@codeaurora.org>
Date: Thu, 26 Nov 2020 14:34:08 +0530
Subject: [PATCH 006/116] disp: msm: sde: always enable prog fetch and fix
 prefill calculations

Enabling and disabling programmable fetch dynamically
across different fps can cause dsi underflow/overflow followed
by underrun. Add changes to always enable prog fetch to handle
such cases. Fix needed_prefill_lines calculation for vfp method
of dfps since linetime is constant in this method and hence
prefill lines need to be based on max_fps. For panels whose
linetime varies with fps, the needed_prefill_lines calculation
remains unchanged.

Change-Id: Ib7b68b577ff903fc2359a8e8c4573d62d55c3828
Signed-off-by: Jayaprakash <jmadiset@codeaurora.org>
---
 msm/sde/sde_encoder_phys_vid.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/msm/sde/sde_encoder_phys_vid.c b/msm/sde/sde_encoder_phys_vid.c
index 7a156c7bd2bc..7e444aa4dc79 100644
--- a/msm/sde/sde_encoder_phys_vid.c
+++ b/msm/sde/sde_encoder_phys_vid.c
@@ -205,6 +205,7 @@ static u32 programmable_fetch_get_num_lines(
 		const struct intf_timing_params *timing)
 {
 	struct sde_encoder_phys *phys_enc = &vid_enc->base;
+	struct sde_mdss_cfg *m;
 
 	u32 needed_prefill_lines, needed_vfp_lines, actual_vfp_lines;
 	const u32 fixed_prefill_fps = DEFAULT_FPS;
@@ -213,18 +214,23 @@ static u32 programmable_fetch_get_num_lines(
 	u32 start_of_frame_lines =
 	    timing->v_back_porch + timing->vsync_pulse_width;
 	u32 v_front_porch = timing->v_front_porch;
+	u32 vrefresh, max_fps;
+
+	m = phys_enc->sde_kms->catalog;
+	max_fps = sde_encoder_get_dfps_maxfps(phys_enc->parent);
+	vrefresh = (max_fps > timing->vrefresh) ? max_fps : timing->vrefresh;
 
 	/* minimum prefill lines are defined based on 60fps */
-	needed_prefill_lines = (timing->vrefresh > fixed_prefill_fps) ?
-		((default_prefill_lines * timing->vrefresh) /
+	needed_prefill_lines = (vrefresh > fixed_prefill_fps) ?
+		((default_prefill_lines * vrefresh) /
 			fixed_prefill_fps) : default_prefill_lines;
 	needed_vfp_lines = needed_prefill_lines - start_of_frame_lines;
 
 	/* Fetch must be outside active lines, otherwise undefined. */
 	if (start_of_frame_lines >= needed_prefill_lines) {
 		SDE_DEBUG_VIDENC(vid_enc,
-				"prog fetch is not needed, large vbp+vsw\n");
-		actual_vfp_lines = 0;
+				"prog fetch always enabled case\n");
+		actual_vfp_lines = (m->delay_prg_fetch_start) ? 2 : 1;
 	} else if (v_front_porch < needed_vfp_lines) {
 		/* Warn fetch needed, but not enough porch in panel config */
 		pr_warn_once
@@ -239,7 +245,7 @@ static u32 programmable_fetch_get_num_lines(
 
 	SDE_DEBUG_VIDENC(vid_enc,
 		"vrefresh:%u v_front_porch:%u v_back_porch:%u vsync_pulse_width:%u\n",
-		timing->vrefresh, v_front_porch, timing->v_back_porch,
+		vrefresh, v_front_porch, timing->v_back_porch,
 		timing->vsync_pulse_width);
 	SDE_DEBUG_VIDENC(vid_enc,
 		"prefill_lines:%u needed_vfp_lines:%u actual_vfp_lines:%u\n",

From fcd859f926565161ea116d0a5f46127ef5c3bcbb Mon Sep 17 00:00:00 2001
From: Narendra Muppalla <NarendraM@codeaurora.org>
Date: Thu, 10 Dec 2020 13:02:11 -0800
Subject: [PATCH 007/116] disp: msm: sde: use different spin lock for frame
 events

Due to lock sequence inconsistency between sde_crtc->spin_lock and
sde_kms->hw_intr->irq_lock can cause deadlock, to avoid this possible
deadlock this change uses different spin lock for frame events.

Change-Id: I51b1184dfa1069c87653099b95b992b277721daf
Signed-off-by: Narendra Muppalla <NarendraM@codeaurora.org>
---
 msm/sde/sde_crtc.c | 11 ++++++-----
 msm/sde/sde_crtc.h |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c
index 50c64f3ad3a2..d8dbc1569180 100644
--- a/msm/sde/sde_crtc.c
+++ b/msm/sde/sde_crtc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
  * Copyright (C) 2013 Red Hat
  * Author: Rob Clark <robdclark@gmail.com>
  *
@@ -2232,12 +2232,12 @@ static void sde_crtc_frame_event_cb(void *data, u32 event)
 	SDE_DEBUG("crtc%d\n", crtc->base.id);
 	SDE_EVT32_VERBOSE(DRMID(crtc), event);
 
-	spin_lock_irqsave(&sde_crtc->spin_lock, flags);
+	spin_lock_irqsave(&sde_crtc->fevent_spin_lock, flags);
 	fevent = list_first_entry_or_null(&sde_crtc->frame_event_list,
 			struct sde_crtc_frame_event, list);
 	if (fevent)
 		list_del_init(&fevent->list);
-	spin_unlock_irqrestore(&sde_crtc->spin_lock, flags);
+	spin_unlock_irqrestore(&sde_crtc->fevent_spin_lock, flags);
 
 	if (!fevent) {
 		SDE_ERROR("crtc%d event %d overflow\n",
@@ -2536,9 +2536,9 @@ static void sde_crtc_frame_event_work(struct kthread_work *work)
 		SDE_ERROR("crtc%d ts:%lld received panel dead event\n",
 				crtc->base.id, ktime_to_ns(fevent->ts));
 
-	spin_lock_irqsave(&sde_crtc->spin_lock, flags);
+	spin_lock_irqsave(&sde_crtc->fevent_spin_lock, flags);
 	list_add_tail(&fevent->list, &sde_crtc->frame_event_list);
-	spin_unlock_irqrestore(&sde_crtc->spin_lock, flags);
+	spin_unlock_irqrestore(&sde_crtc->fevent_spin_lock, flags);
 	SDE_ATRACE_END("crtc_frame_event");
 }
 
@@ -6591,6 +6591,7 @@ struct drm_crtc *sde_crtc_init(struct drm_device *dev, struct drm_plane *plane)
 
 	mutex_init(&sde_crtc->crtc_lock);
 	spin_lock_init(&sde_crtc->spin_lock);
+	spin_lock_init(&sde_crtc->fevent_spin_lock);
 	atomic_set(&sde_crtc->frame_pending, 0);
 
 	sde_crtc->enabled = false;
diff --git a/msm/sde/sde_crtc.h b/msm/sde/sde_crtc.h
index 7892d50f9e5f..bb7fa3b82010 100644
--- a/msm/sde/sde_crtc.h
+++ b/msm/sde/sde_crtc.h
@@ -259,7 +259,8 @@ struct sde_crtc_misr_info {
  * @frame_pending : Whether or not an update is pending
  * @frame_events  : static allocation of in-flight frame events
  * @frame_event_list : available frame event list
- * @spin_lock     : spin lock for frame event, transaction status, etc...
+ * @spin_lock     : spin lock for transaction status, etc...
+ * @fevent_spin_lock     : spin lock for frame event
  * @event_thread  : Pointer to event handler thread
  * @event_worker  : Event worker queue
  * @event_cache   : Local cache of event worker structures
@@ -342,6 +343,7 @@ struct sde_crtc {
 	struct sde_crtc_frame_event frame_events[SDE_CRTC_FRAME_EVENT_SIZE];
 	struct list_head frame_event_list;
 	spinlock_t spin_lock;
+	spinlock_t fevent_spin_lock;
 
 	/* for handling internal event thread */
 	struct sde_crtc_event event_cache[SDE_CRTC_MAX_EVENT_COUNT];

From 72ad7c669ba7f818a2c6fa0baca9876071f577dc Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 24 Jul 2019 08:05:26 -0500
Subject: [PATCH 008/116] 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).

Change-Id: I861aaa3d26e4dbe13183df92f408fdefa709fe61
Reviewed-on: https://gerrit.mot.com/1697222
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 15 ++++++++++++++-
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index b98447056ce3..2b8a53819195 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -543,6 +543,8 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	int rc = 0;
 	unsigned long mode_flags = 0;
 	struct mipi_dsi_device *dsi = NULL;
+	struct dsi_backlight_config *bl = &panel->bl_config;
+	u32 bl_lvl_2bytes;
 
 	if (!panel || (bl_lvl > 0xffff)) {
 		DSI_ERR("invalid params\n");
@@ -558,7 +560,13 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	if (panel->bl_config.bl_inverted_dbv)
 		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
 
-	rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);
+        if (bl->bl_2bytes_enable){
+                bl_lvl_2bytes =  ((bl_lvl & 0xff00) >> 8) | ((bl_lvl & 0xff) << 8);
+                rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl_2bytes);
+        }
+	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);
 
@@ -2455,6 +2463,11 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 	else
 		DSI_ERR("bl-dsc-cmd-state command state unrecognized-%s\n",
 			state);
+	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);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 3fc6baf9fd13..baa82d2f7fbf 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -118,6 +118,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 b6b7d7770441b7bb26c1255e62a8f197b6bb0f52 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 25 Jul 2019 10:11:43 -0500
Subject: [PATCH 009/116] 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: 8c661f3540990aa1c37f1ef9b5b361114eec86ce
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>

Change-Id: I7c05aa6b0cf8f0128c8421d58d5a22647fd1b164
Reviewed-on: https://gerrit.mot.com/1697229
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 229643bf9b88..5d0767ac4936 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -7890,6 +7890,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);
 
@@ -8560,6 +8561,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 2b8a53819195..0a65a9135086 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -338,6 +338,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",
@@ -383,6 +384,7 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 		DSI_DEBUG("TWM Enabled, skip panel power off\n");
 		return rc;
 	}
+	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);
 
@@ -2466,7 +2468,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) {
@@ -4685,6 +4687,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);
@@ -4758,6 +4761,7 @@ int dsi_panel_disable(struct dsi_panel *panel)
 		DSI_DEBUG("TWM Enabled, skip panel disable\n");
 		return rc;
 	}
+	DSI_INFO("%s(%s)+\n", __func__, panel->name);
 	mutex_lock(&panel->panel_lock);
 
 	/* Avoid sending panel off commands when ESD recovery is underway */

From 0fc8989fbd0840897e7ceddd6fe2cd21551c0a63 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 24 Jul 2019 14:31:35 -0500
Subject: [PATCH 010/116] 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: (CR).

Change-Id: I1b0c2759deaa4b0808fd4f0503943a191842235e
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697250
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@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 0a65a9135086..3261ea91253f 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -645,6 +645,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:
@@ -732,6 +735,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:
@@ -767,6 +772,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:
@@ -2403,6 +2410,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 baa82d2f7fbf..2379206924f4 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -48,6 +48,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 5e7ff8e6bd9fcfdc1e28505ed6b83a8bad25fb72 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 25 Jul 2019 10:15:12 -0500
Subject: [PATCH 011/116] disp: msm: sde: Change display ESD checking interval
 to 8s

Change the ESD detection and recovery interval to 8 second

Port from: 9679d374c0f7229febbd23cd5531694a9faf6c6c

Change-Id: Iad8b11db9a5794fa10e32a52035456f32ee0d304
Reviewed-on: https://gerrit.mot.com/1697251
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 db50ede366ce..2322880079e9 100644
--- a/msm/sde/sde_kms.h
+++ b/msm/sde/sde_kms.h
@@ -126,7 +126,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 0223f45a59856b4b2b4bab8d0568ac0de92ef7bd Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 25 Jul 2019 12:56:02 -0500
Subject: [PATCH 012/116] 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: 2701eb2

Change-Id: Ibd1c9429854655ea7c80222ce64c3b86c6df2eda
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697267
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c      |   47 +
 msm/dsi/dsi_panel.c.orig | 4743 ++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h      |    5 +
 3 files changed, 4795 insertions(+)
 create mode 100644 msm/dsi/dsi_panel.c.orig

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 3261ea91253f..96fbb6e1d525 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -36,6 +36,8 @@
 #define DEFAULT_PANEL_PREFILL_LINES	25
 #define HIGH_REFRESH_RATE_THRESHOLD_TIME_US	500
 #define MIN_PREFILL_LINES      40
+#define DSI_PANEL_UNKNOWN_PANEL_NAME	"unknown"
+#define DSI_PANEL_PANEL_DEFAULT_VER 	0xffffffffffffffff
 
 static void dsi_dce_prepare_pps_header(char *buf, u32 pps_delay_ms)
 {
@@ -1425,6 +1427,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;
@@ -3548,6 +3589,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.c.orig b/msm/dsi/dsi_panel.c.orig
new file mode 100644
index 000000000000..0c3c292a35de
--- /dev/null
+++ b/msm/dsi/dsi_panel.c.orig
@@ -0,0 +1,4743 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
+ */
+
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/of_gpio.h>
+#include <linux/pwm.h>
+#include <video/mipi_display.h>
+
+#include "dsi_panel.h"
+#include "dsi_ctrl_hw.h"
+#include "dsi_parser.h"
+#include "sde_dsc_helper.h"
+#include "sde_vdc_helper.h"
+
+/**
+ * topology is currently defined by a set of following 3 values:
+ * 1. num of layer mixers
+ * 2. num of compression encoders
+ * 3. num of interfaces
+ */
+#define TOPOLOGY_SET_LEN 3
+#define MAX_TOPOLOGY 5
+
+#define DSI_PANEL_DEFAULT_LABEL  "Default dsi panel"
+
+#define DEFAULT_PANEL_JITTER_NUMERATOR		2
+#define DEFAULT_PANEL_JITTER_DENOMINATOR	1
+#define DEFAULT_PANEL_JITTER_ARRAY_SIZE		2
+#define MAX_PANEL_JITTER		10
+#define DEFAULT_PANEL_PREFILL_LINES	25
+#define HIGH_REFRESH_RATE_THRESHOLD_TIME_US	500
+<<<<<<< HEAD
+#define MIN_PREFILL_LINES      40
+=======
+#define MIN_PREFILL_LINES      35
+#define DSI_PANEL_UNKNOWN_PANEL_NAME	"unknown"
+#define DSI_PANEL_PANEL_DEFAULT_VER 	0xffffffffffffffff
+>>>>>>> cb5f0299... IKSWR-998: disp: msm: dsi: parsing BL setting ESD and panel
+
+static void dsi_dce_prepare_pps_header(char *buf, u32 pps_delay_ms)
+{
+	char *bp;
+
+	bp = buf;
+	/* First 7 bytes are cmd header */
+	*bp++ = 0x0A;
+	*bp++ = 1;
+	*bp++ = 0;
+	*bp++ = 0;
+	*bp++ = pps_delay_ms;
+	*bp++ = 0;
+	*bp++ = 128;
+}
+
+static int dsi_dsc_create_pps_buf_cmd(struct msm_display_dsc_info *dsc,
+	char *buf, int pps_id, u32 size)
+{
+	dsi_dce_prepare_pps_header(buf, dsc->pps_delay_ms);
+	buf += DSI_CMD_PPS_HDR_SIZE;
+	return sde_dsc_create_pps_buf_cmd(dsc, buf, pps_id,
+			size);
+}
+
+static int dsi_vdc_create_pps_buf_cmd(struct msm_display_vdc_info *vdc,
+	char *buf, int pps_id, u32 size)
+{
+	dsi_dce_prepare_pps_header(buf, vdc->pps_delay_ms);
+	buf += DSI_CMD_PPS_HDR_SIZE;
+	return sde_vdc_create_pps_buf_cmd(vdc, buf, pps_id,
+			size);
+}
+
+static int dsi_panel_vreg_get(struct dsi_panel *panel)
+{
+	int rc = 0;
+	int i;
+	struct regulator *vreg = NULL;
+
+	for (i = 0; i < panel->power_info.count; i++) {
+		vreg = devm_regulator_get(panel->parent,
+					  panel->power_info.vregs[i].vreg_name);
+		rc = PTR_RET(vreg);
+		if (rc) {
+			DSI_ERR("failed to get %s regulator\n",
+			       panel->power_info.vregs[i].vreg_name);
+			goto error_put;
+		}
+		panel->power_info.vregs[i].vreg = vreg;
+	}
+
+	return rc;
+error_put:
+	for (i = i - 1; i >= 0; i--) {
+		devm_regulator_put(panel->power_info.vregs[i].vreg);
+		panel->power_info.vregs[i].vreg = NULL;
+	}
+	return rc;
+}
+
+static int dsi_panel_vreg_put(struct dsi_panel *panel)
+{
+	int rc = 0;
+	int i;
+
+	for (i = panel->power_info.count - 1; i >= 0; i--)
+		devm_regulator_put(panel->power_info.vregs[i].vreg);
+
+	return rc;
+}
+
+static int dsi_panel_gpio_request(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_panel_reset_config *r_config = &panel->reset_config;
+
+	if (gpio_is_valid(r_config->reset_gpio)) {
+		rc = gpio_request(r_config->reset_gpio, "reset_gpio");
+		if (rc) {
+			DSI_ERR("request for reset_gpio failed, rc=%d\n", rc);
+			goto error;
+		}
+	}
+
+	if (gpio_is_valid(r_config->disp_en_gpio)) {
+		rc = gpio_request(r_config->disp_en_gpio, "disp_en_gpio");
+		if (rc) {
+			DSI_ERR("request for disp_en_gpio failed, rc=%d\n", rc);
+			goto error_release_reset;
+		}
+	}
+
+	if (gpio_is_valid(panel->bl_config.en_gpio)) {
+		rc = gpio_request(panel->bl_config.en_gpio, "bklt_en_gpio");
+		if (rc) {
+			DSI_ERR("request for bklt_en_gpio failed, rc=%d\n", rc);
+			goto error_release_disp_en;
+		}
+	}
+
+	if (gpio_is_valid(r_config->lcd_mode_sel_gpio)) {
+		rc = gpio_request(r_config->lcd_mode_sel_gpio, "mode_gpio");
+		if (rc) {
+			DSI_ERR("request for mode_gpio failed, rc=%d\n", rc);
+			goto error_release_mode_sel;
+		}
+	}
+
+	if (gpio_is_valid(panel->panel_test_gpio)) {
+		rc = gpio_request(panel->panel_test_gpio, "panel_test_gpio");
+		if (rc) {
+			DSI_WARN("request for panel_test_gpio failed, rc=%d\n",
+				 rc);
+			panel->panel_test_gpio = -1;
+			rc = 0;
+		}
+	}
+
+	goto error;
+error_release_mode_sel:
+	if (gpio_is_valid(panel->bl_config.en_gpio))
+		gpio_free(panel->bl_config.en_gpio);
+error_release_disp_en:
+	if (gpio_is_valid(r_config->disp_en_gpio))
+		gpio_free(r_config->disp_en_gpio);
+error_release_reset:
+	if (gpio_is_valid(r_config->reset_gpio))
+		gpio_free(r_config->reset_gpio);
+error:
+	return rc;
+}
+
+static int dsi_panel_gpio_release(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_panel_reset_config *r_config = &panel->reset_config;
+
+	if (gpio_is_valid(r_config->reset_gpio))
+		gpio_free(r_config->reset_gpio);
+
+	if (gpio_is_valid(r_config->disp_en_gpio))
+		gpio_free(r_config->disp_en_gpio);
+
+	if (gpio_is_valid(panel->bl_config.en_gpio))
+		gpio_free(panel->bl_config.en_gpio);
+
+	if (gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))
+		gpio_free(panel->reset_config.lcd_mode_sel_gpio);
+
+	if (gpio_is_valid(panel->panel_test_gpio))
+		gpio_free(panel->panel_test_gpio);
+
+	return rc;
+}
+
+int dsi_panel_trigger_esd_attack(struct dsi_panel *panel)
+{
+	struct dsi_panel_reset_config *r_config;
+
+	if (!panel) {
+		DSI_ERR("Invalid panel param\n");
+		return -EINVAL;
+	}
+
+	r_config = &panel->reset_config;
+	if (!r_config) {
+		DSI_ERR("Invalid panel reset configuration\n");
+		return -EINVAL;
+	}
+
+	if (gpio_is_valid(r_config->reset_gpio)) {
+		gpio_set_value(r_config->reset_gpio, 0);
+		DSI_INFO("GPIO pulled low to simulate ESD\n");
+		return 0;
+	}
+	DSI_ERR("failed to pull down gpio\n");
+	return -EINVAL;
+}
+
+static int dsi_panel_reset(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_panel_reset_config *r_config = &panel->reset_config;
+	int i;
+
+	if (gpio_is_valid(panel->reset_config.disp_en_gpio)) {
+		rc = gpio_direction_output(panel->reset_config.disp_en_gpio, 1);
+		if (rc) {
+			DSI_ERR("unable to set dir for disp gpio rc=%d\n", rc);
+			goto exit;
+		}
+	}
+
+	if (r_config->count) {
+		rc = gpio_direction_output(r_config->reset_gpio,
+			r_config->sequence[0].level);
+		if (rc) {
+			DSI_ERR("unable to set dir for rst gpio rc=%d\n", rc);
+			goto exit;
+		}
+	}
+
+	for (i = 0; i < r_config->count; i++) {
+		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(panel->bl_config.en_gpio)) {
+		rc = gpio_direction_output(panel->bl_config.en_gpio, 1);
+		if (rc)
+			DSI_ERR("unable to set dir for bklt gpio rc=%d\n", rc);
+	}
+
+	if (gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio)) {
+		bool out = true;
+
+		if ((panel->reset_config.mode_sel_state == MODE_SEL_DUAL_PORT)
+				|| (panel->reset_config.mode_sel_state
+					== MODE_GPIO_LOW))
+			out = false;
+		else if ((panel->reset_config.mode_sel_state
+				== MODE_SEL_SINGLE_PORT) ||
+				(panel->reset_config.mode_sel_state
+				 == MODE_GPIO_HIGH))
+			out = true;
+
+		rc = gpio_direction_output(
+			panel->reset_config.lcd_mode_sel_gpio, out);
+		if (rc)
+			DSI_ERR("unable to set dir for mode gpio rc=%d\n", rc);
+	}
+
+	if (gpio_is_valid(panel->panel_test_gpio)) {
+		rc = gpio_direction_input(panel->panel_test_gpio);
+		if (rc)
+			DSI_WARN("unable to set dir for panel test gpio rc=%d\n",
+					rc);
+	}
+
+exit:
+	return rc;
+}
+
+static int dsi_panel_set_pinctrl_state(struct dsi_panel *panel, bool enable)
+{
+	int rc = 0;
+	struct pinctrl_state *state;
+
+	if (panel->host_config.ext_bridge_mode)
+		return 0;
+
+	if (!panel->pinctrl.pinctrl)
+		return 0;
+
+	if (enable)
+		state = panel->pinctrl.active;
+	else
+		state = panel->pinctrl.suspend;
+
+	rc = pinctrl_select_state(panel->pinctrl.pinctrl, state);
+	if (rc)
+		DSI_ERR("[%s] failed to set pin state, rc=%d\n",
+				panel->name, rc);
+
+	return rc;
+}
+
+
+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",
+				panel->name, rc);
+		goto exit;
+	}
+
+	rc = dsi_panel_set_pinctrl_state(panel, true);
+	if (rc) {
+		DSI_ERR("[%s] failed to set pinctrl, rc=%d\n", panel->name, rc);
+		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);
+
+exit:
+	return rc;
+}
+
+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);
+
+	if (gpio_is_valid(panel->reset_config.reset_gpio))
+		gpio_set_value(panel->reset_config.reset_gpio, 0);
+
+	if (gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))
+		gpio_set_value(panel->reset_config.lcd_mode_sel_gpio, 0);
+
+	if (gpio_is_valid(panel->panel_test_gpio)) {
+		rc = gpio_direction_input(panel->panel_test_gpio);
+		if (rc)
+			DSI_WARN("set dir for panel test gpio failed rc=%d\n",
+				 rc);
+	}
+
+	rc = dsi_panel_set_pinctrl_state(panel, false);
+	if (rc) {
+		DSI_ERR("[%s] failed set pinctrl state, rc=%d\n", panel->name,
+		       rc);
+	}
+
+	rc = dsi_pwr_enable_regulator(&panel->power_info, false);
+	if (rc)
+		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
+				panel->name, rc);
+
+	return rc;
+}
+static int dsi_panel_tx_cmd_set(struct dsi_panel *panel,
+				enum dsi_cmd_set_type type)
+{
+	int rc = 0, i = 0;
+	ssize_t len;
+	struct dsi_cmd_desc *cmds;
+	u32 count;
+	enum dsi_cmd_set_state state;
+	struct dsi_display_mode *mode;
+	const struct mipi_dsi_host_ops *ops = panel->host->ops;
+
+	if (!panel || !panel->cur_mode)
+		return -EINVAL;
+
+	mode = panel->cur_mode;
+
+	cmds = mode->priv_info->cmd_sets[type].cmds;
+	count = mode->priv_info->cmd_sets[type].count;
+	state = mode->priv_info->cmd_sets[type].state;
+
+	if (count == 0) {
+		DSI_DEBUG("[%s] No commands to be sent for state(%d)\n",
+			 panel->name, type);
+		goto error;
+	}
+
+	for (i = 0; i < count; i++) {
+		if (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;
+
+		if (type == DSI_CMD_SET_VID_TO_CMD_SWITCH)
+			cmds->msg.flags |= MIPI_DSI_MSG_ASYNC_OVERRIDE;
+
+		len = ops->transfer(panel->host, &cmds->msg);
+		if (len < 0) {
+			rc = len;
+			DSI_ERR("failed to set cmds(%d), rc=%d\n", type, rc);
+			goto error;
+		}
+		if (cmds->post_wait_ms)
+			usleep_range(cmds->post_wait_ms*1000,
+					((cmds->post_wait_ms*1000)+10));
+		cmds++;
+	}
+error:
+	return rc;
+}
+
+static int dsi_panel_pinctrl_deinit(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (panel->host_config.ext_bridge_mode)
+		return 0;
+
+	devm_pinctrl_put(panel->pinctrl.pinctrl);
+
+	return rc;
+}
+
+static int dsi_panel_pinctrl_init(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (panel->host_config.ext_bridge_mode)
+		return 0;
+
+	/* TODO:  pinctrl is defined in dsi dt node */
+	panel->pinctrl.pinctrl = devm_pinctrl_get(panel->parent);
+	if (IS_ERR_OR_NULL(panel->pinctrl.pinctrl)) {
+		rc = PTR_ERR(panel->pinctrl.pinctrl);
+		DSI_ERR("failed to get pinctrl, rc=%d\n", rc);
+		goto error;
+	}
+
+	panel->pinctrl.active = pinctrl_lookup_state(panel->pinctrl.pinctrl,
+						       "panel_active");
+	if (IS_ERR_OR_NULL(panel->pinctrl.active)) {
+		rc = PTR_ERR(panel->pinctrl.active);
+		DSI_ERR("failed to get pinctrl active state, rc=%d\n", rc);
+		goto error;
+	}
+
+	panel->pinctrl.suspend =
+		pinctrl_lookup_state(panel->pinctrl.pinctrl, "panel_suspend");
+
+	if (IS_ERR_OR_NULL(panel->pinctrl.suspend)) {
+		rc = PTR_ERR(panel->pinctrl.suspend);
+		DSI_ERR("failed to get pinctrl suspend state, rc=%d\n", rc);
+		goto error;
+	}
+
+	panel->pinctrl.pwm_pin =
+		pinctrl_lookup_state(panel->pinctrl.pinctrl, "pwm_pin");
+
+	if (IS_ERR_OR_NULL(panel->pinctrl.pwm_pin)) {
+		panel->pinctrl.pwm_pin = NULL;
+		DSI_DEBUG("failed to get pinctrl pwm_pin");
+	}
+
+error:
+	return rc;
+}
+
+static int dsi_panel_wled_register(struct dsi_panel *panel,
+		struct dsi_backlight_config *bl)
+{
+	struct backlight_device *bd;
+
+	bd = backlight_device_get_by_type(BACKLIGHT_RAW);
+	if (!bd) {
+		DSI_ERR("[%s] fail raw backlight register rc=%d\n",
+				panel->name, -EPROBE_DEFER);
+		return -EPROBE_DEFER;
+	}
+
+	bl->raw_bd = bd;
+	return 0;
+}
+
+static int dsi_panel_update_backlight(struct dsi_panel *panel,
+	u32 bl_lvl)
+{
+	int rc = 0;
+	unsigned long mode_flags = 0;
+	struct mipi_dsi_device *dsi = NULL;
+	struct dsi_backlight_config *bl = &panel->bl_config;
+	u32 bl_lvl_2bytes;
+
+	if (!panel || (bl_lvl > 0xffff)) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	dsi = &panel->mipi_device;
+	if (unlikely(panel->bl_config.lp_mode)) {
+		mode_flags = dsi->mode_flags;
+		dsi->mode_flags |= MIPI_DSI_MODE_LPM;
+	}
+
+	if (panel->bl_config.bl_inverted_dbv)
+		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
+
+        if (bl->bl_2bytes_enable){
+                bl_lvl_2bytes =  ((bl_lvl & 0xff00) >> 8) | ((bl_lvl & 0xff) << 8);
+                rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl_2bytes);
+        }
+	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);
+
+	if (unlikely(panel->bl_config.lp_mode))
+		dsi->mode_flags = mode_flags;
+
+	return rc;
+}
+
+static int dsi_panel_update_pwm_backlight(struct dsi_panel *panel,
+	u32 bl_lvl)
+{
+	int rc = 0;
+	u32 duty = 0;
+	u32 period_ns = 0;
+	struct dsi_backlight_config *bl;
+
+	if (!panel) {
+		DSI_ERR("Invalid Params\n");
+		return -EINVAL;
+	}
+
+	bl = &panel->bl_config;
+	if (!bl->pwm_bl) {
+		DSI_ERR("pwm device not found\n");
+		return -EINVAL;
+	}
+
+	period_ns = bl->pwm_period_usecs * NSEC_PER_USEC;
+	duty = bl_lvl * period_ns;
+	duty /= bl->bl_max_level;
+
+	rc = pwm_config(bl->pwm_bl, duty, period_ns);
+	if (rc) {
+		DSI_ERR("[%s] failed to change pwm config, rc=\n", panel->name,
+			rc);
+		goto error;
+	}
+
+	if (bl_lvl == 0 && bl->pwm_enabled) {
+		pwm_disable(bl->pwm_bl);
+		bl->pwm_enabled = false;
+		return 0;
+	}
+
+	if (!bl->pwm_enabled) {
+		rc = pwm_enable(bl->pwm_bl);
+		if (rc) {
+			DSI_ERR("[%s] failed to enable pwm, rc=\n", panel->name,
+				rc);
+			goto error;
+		}
+
+		bl->pwm_enabled = true;
+	}
+
+error:
+	return rc;
+}
+
+int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
+{
+	int rc = 0;
+	struct dsi_backlight_config *bl = &panel->bl_config;
+
+	if (panel->host_config.ext_bridge_mode)
+		return 0;
+
+	DSI_DEBUG("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);
+		break;
+	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:
+		rc = dsi_panel_update_pwm_backlight(panel, bl_lvl);
+		break;
+	default:
+		DSI_ERR("Backlight type(%d) not supported\n", bl->type);
+		rc = -ENOTSUPP;
+	}
+
+	return rc;
+}
+
+static u32 dsi_panel_get_brightness(struct dsi_backlight_config *bl)
+{
+	u32 cur_bl_level;
+	struct backlight_device *bd = bl->raw_bd;
+
+	/* default the brightness level to 50% */
+	cur_bl_level = bl->bl_max_level >> 1;
+
+	switch (bl->type) {
+	case DSI_BACKLIGHT_WLED:
+		/* Try to query the backlight level from the backlight device */
+		if (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:
+	default:
+		/*
+		 * Ideally, we should read the backlight level from the
+		 * panel. For now, just set it default value.
+		 */
+		break;
+	}
+
+	DSI_DEBUG("cur_bl_level=%d\n", cur_bl_level);
+	return cur_bl_level;
+}
+
+void dsi_panel_bl_handoff(struct dsi_panel *panel)
+{
+	struct dsi_backlight_config *bl = &panel->bl_config;
+
+	bl->bl_level = dsi_panel_get_brightness(bl);
+}
+
+static int dsi_panel_pwm_register(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_backlight_config *bl = &panel->bl_config;
+
+	bl->pwm_bl = devm_of_pwm_get(panel->parent, panel->panel_of_node, NULL);
+	if (IS_ERR_OR_NULL(bl->pwm_bl)) {
+		rc = PTR_ERR(bl->pwm_bl);
+		DSI_ERR("[%s] failed to request pwm, rc=%d\n", panel->name,
+			rc);
+		return rc;
+	}
+
+	if (panel->pinctrl.pwm_pin) {
+		rc = pinctrl_select_state(panel->pinctrl.pinctrl,
+			panel->pinctrl.pwm_pin);
+		if (rc)
+			DSI_ERR("[%s] failed to set pwm pinctrl, rc=%d\n",
+				panel->name, rc);
+	}
+
+	return 0;
+}
+
+static int dsi_panel_bl_register(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_backlight_config *bl = &panel->bl_config;
+
+	if (panel->host_config.ext_bridge_mode)
+		return 0;
+
+	switch (bl->type) {
+	case DSI_BACKLIGHT_WLED:
+		rc = dsi_panel_wled_register(panel, bl);
+		break;
+	case DSI_BACKLIGHT_DCS:
+		break;
+	case DSI_BACKLIGHT_DUMMY:
+		break;
+	case DSI_BACKLIGHT_EXTERNAL:
+		break;
+	case DSI_BACKLIGHT_PWM:
+		rc = dsi_panel_pwm_register(panel);
+		break;
+	default:
+		DSI_ERR("Backlight type(%d) not supported\n", bl->type);
+		rc = -ENOTSUPP;
+		goto error;
+	}
+
+error:
+	return rc;
+}
+
+static void dsi_panel_pwm_unregister(struct dsi_panel *panel)
+{
+	struct dsi_backlight_config *bl = &panel->bl_config;
+
+	devm_pwm_put(panel->parent, bl->pwm_bl);
+}
+
+static int dsi_panel_bl_unregister(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_backlight_config *bl = &panel->bl_config;
+
+	if (panel->host_config.ext_bridge_mode)
+		return 0;
+
+	switch (bl->type) {
+	case DSI_BACKLIGHT_WLED:
+		break;
+	case DSI_BACKLIGHT_DCS:
+		break;
+	case DSI_BACKLIGHT_DUMMY:
+		break;
+	case DSI_BACKLIGHT_EXTERNAL:
+		break;
+	case DSI_BACKLIGHT_PWM:
+		dsi_panel_pwm_unregister(panel);
+		break;
+	default:
+		DSI_ERR("Backlight type(%d) not supported\n", bl->type);
+		rc = -ENOTSUPP;
+		goto error;
+	}
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_timing(struct dsi_mode_info *mode,
+				  struct dsi_parser_utils *utils)
+{
+	int rc = 0;
+	u64 tmp64 = 0;
+	struct dsi_display_mode *display_mode;
+	struct dsi_display_mode_priv_info *priv_info;
+
+	display_mode = container_of(mode, struct dsi_display_mode, timing);
+
+	priv_info = display_mode->priv_info;
+
+	rc = utils->read_u64(utils->data,
+			"qcom,mdss-dsi-panel-clockrate", &tmp64);
+	if (rc == -EOVERFLOW) {
+		tmp64 = 0;
+		rc = utils->read_u32(utils->data,
+			"qcom,mdss-dsi-panel-clockrate", (u32 *)&tmp64);
+	}
+
+	mode->clk_rate_hz = !rc ? tmp64 : 0;
+	display_mode->priv_info->clk_rate_hz = mode->clk_rate_hz;
+
+	mode->pclk_scale.numer = 1;
+	mode->pclk_scale.denom = 1;
+	display_mode->priv_info->pclk_scale = mode->pclk_scale;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-mdp-transfer-time-us",
+				&mode->mdp_transfer_time_us);
+	if (!rc)
+		display_mode->priv_info->mdp_transfer_time_us =
+			mode->mdp_transfer_time_us;
+	else
+		display_mode->priv_info->mdp_transfer_time_us = 0;
+
+	rc = utils->read_u32(utils->data,
+				"qcom,mdss-dsi-panel-framerate",
+				&mode->refresh_rate);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-panel-framerate, rc=%d\n",
+		       rc);
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-panel-width",
+				  &mode->h_active);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-panel-width, rc=%d\n",
+				rc);
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data,
+				"qcom,mdss-dsi-h-front-porch",
+				  &mode->h_front_porch);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-h-front-porch, rc=%d\n",
+		       rc);
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data,
+				"qcom,mdss-dsi-h-back-porch",
+				  &mode->h_back_porch);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-h-back-porch, rc=%d\n",
+		       rc);
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data,
+				"qcom,mdss-dsi-h-pulse-width",
+				  &mode->h_sync_width);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-h-pulse-width, rc=%d\n",
+		       rc);
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-h-sync-skew",
+				  &mode->h_skew);
+	if (rc)
+		DSI_DEBUG("qcom,mdss-dsi-h-sync-skew is not defined, rc=%d\n",
+				rc);
+
+	DSI_DEBUG("panel horz active:%d front_portch:%d back_porch:%d sync_skew:%d\n",
+		mode->h_active, mode->h_front_porch, mode->h_back_porch,
+		mode->h_sync_width);
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-panel-height",
+				  &mode->v_active);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-panel-height, rc=%d\n",
+		       rc);
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-v-back-porch",
+				  &mode->v_back_porch);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-v-back-porch, rc=%d\n",
+		       rc);
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-v-front-porch",
+				  &mode->v_front_porch);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-v-back-porch, rc=%d\n",
+		       rc);
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-v-pulse-width",
+				  &mode->v_sync_width);
+	if (rc) {
+		DSI_ERR("failed to read qcom,mdss-dsi-v-pulse-width, rc=%d\n",
+		       rc);
+		goto error;
+	}
+	DSI_DEBUG("panel vert active:%d front_portch:%d back_porch:%d pulse_width:%d\n",
+		mode->v_active, mode->v_front_porch, mode->v_back_porch,
+		mode->v_sync_width);
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_pixel_format(struct dsi_host_common_cfg *host,
+					struct dsi_parser_utils *utils,
+					const char *name)
+{
+	int rc = 0;
+	u32 bpp = 0;
+	enum dsi_pixel_format fmt;
+	const char *packing;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bpp", &bpp);
+	if (rc) {
+		DSI_ERR("[%s] failed to read qcom,mdss-dsi-bpp, rc=%d\n",
+		       name, rc);
+		return rc;
+	}
+
+	host->bpp = bpp;
+
+	switch (bpp) {
+	case 3:
+		fmt = DSI_PIXEL_FORMAT_RGB111;
+		break;
+	case 8:
+		fmt = DSI_PIXEL_FORMAT_RGB332;
+		break;
+	case 12:
+		fmt = DSI_PIXEL_FORMAT_RGB444;
+		break;
+	case 16:
+		fmt = DSI_PIXEL_FORMAT_RGB565;
+		break;
+	case 18:
+		fmt = DSI_PIXEL_FORMAT_RGB666;
+		break;
+	case 24:
+	default:
+		fmt = DSI_PIXEL_FORMAT_RGB888;
+		break;
+	}
+
+	if (fmt == DSI_PIXEL_FORMAT_RGB666) {
+		packing = utils->get_property(utils->data,
+					  "qcom,mdss-dsi-pixel-packing",
+					  NULL);
+		if (packing && !strcmp(packing, "loose"))
+			fmt = DSI_PIXEL_FORMAT_RGB666_LOOSE;
+	}
+
+	host->dst_format = fmt;
+	return rc;
+}
+
+static int dsi_panel_parse_lane_states(struct dsi_host_common_cfg *host,
+				       struct dsi_parser_utils *utils,
+				       const char *name)
+{
+	int rc = 0;
+	bool lane_enabled;
+	u32 num_of_lanes = 0;
+
+	lane_enabled = utils->read_bool(utils->data,
+					    "qcom,mdss-dsi-lane-0-state");
+	host->data_lanes |= (lane_enabled ? DSI_DATA_LANE_0 : 0);
+
+	lane_enabled = utils->read_bool(utils->data,
+					     "qcom,mdss-dsi-lane-1-state");
+	host->data_lanes |= (lane_enabled ? DSI_DATA_LANE_1 : 0);
+
+	lane_enabled = utils->read_bool(utils->data,
+					    "qcom,mdss-dsi-lane-2-state");
+	host->data_lanes |= (lane_enabled ? DSI_DATA_LANE_2 : 0);
+
+	lane_enabled = utils->read_bool(utils->data,
+					     "qcom,mdss-dsi-lane-3-state");
+	host->data_lanes |= (lane_enabled ? DSI_DATA_LANE_3 : 0);
+
+	if (host->data_lanes & DSI_DATA_LANE_0)
+		num_of_lanes++;
+	if (host->data_lanes & DSI_DATA_LANE_1)
+		num_of_lanes++;
+	if (host->data_lanes & DSI_DATA_LANE_2)
+		num_of_lanes++;
+	if (host->data_lanes & DSI_DATA_LANE_3)
+		num_of_lanes++;
+
+	host->num_data_lanes = num_of_lanes;
+
+	if (host->data_lanes == 0) {
+		DSI_ERR("[%s] No data lanes are enabled, rc=%d\n", name, rc);
+		rc = -EINVAL;
+	}
+
+	return rc;
+}
+
+static int dsi_panel_parse_color_swap(struct dsi_host_common_cfg *host,
+				      struct dsi_parser_utils *utils,
+				      const char *name)
+{
+	int rc = 0;
+	const char *swap_mode;
+
+	swap_mode = utils->get_property(utils->data,
+			"qcom,mdss-dsi-color-order", NULL);
+	if (swap_mode) {
+		if (!strcmp(swap_mode, "rgb_swap_rgb")) {
+			host->swap_mode = DSI_COLOR_SWAP_RGB;
+		} else if (!strcmp(swap_mode, "rgb_swap_rbg")) {
+			host->swap_mode = DSI_COLOR_SWAP_RBG;
+		} else if (!strcmp(swap_mode, "rgb_swap_brg")) {
+			host->swap_mode = DSI_COLOR_SWAP_BRG;
+		} else if (!strcmp(swap_mode, "rgb_swap_grb")) {
+			host->swap_mode = DSI_COLOR_SWAP_GRB;
+		} else if (!strcmp(swap_mode, "rgb_swap_gbr")) {
+			host->swap_mode = DSI_COLOR_SWAP_GBR;
+		} else {
+			DSI_ERR("[%s] Unrecognized color order-%s\n",
+			       name, swap_mode);
+			rc = -EINVAL;
+		}
+	} else {
+		DSI_DEBUG("[%s] Falling back to default color order\n", name);
+		host->swap_mode = DSI_COLOR_SWAP_RGB;
+	}
+
+	/* bit swap on color channel is not defined in dt */
+	host->bit_swap_red = false;
+	host->bit_swap_green = false;
+	host->bit_swap_blue = false;
+	return rc;
+}
+
+static int dsi_panel_parse_triggers(struct dsi_host_common_cfg *host,
+				    struct dsi_parser_utils *utils,
+				    const char *name)
+{
+	const char *trig;
+	int rc = 0;
+
+	trig = utils->get_property(utils->data,
+			"qcom,mdss-dsi-mdp-trigger", NULL);
+	if (trig) {
+		if (!strcmp(trig, "none")) {
+			host->mdp_cmd_trigger = DSI_TRIGGER_NONE;
+		} else if (!strcmp(trig, "trigger_te")) {
+			host->mdp_cmd_trigger = DSI_TRIGGER_TE;
+		} else if (!strcmp(trig, "trigger_sw")) {
+			host->mdp_cmd_trigger = DSI_TRIGGER_SW;
+		} else if (!strcmp(trig, "trigger_sw_te")) {
+			host->mdp_cmd_trigger = DSI_TRIGGER_SW_TE;
+		} else {
+			DSI_ERR("[%s] Unrecognized mdp trigger type (%s)\n",
+			       name, trig);
+			rc = -EINVAL;
+		}
+
+	} else {
+		DSI_DEBUG("[%s] Falling back to default MDP trigger\n",
+			 name);
+		host->mdp_cmd_trigger = DSI_TRIGGER_SW;
+	}
+
+	trig = utils->get_property(utils->data,
+			"qcom,mdss-dsi-dma-trigger", NULL);
+	if (trig) {
+		if (!strcmp(trig, "none")) {
+			host->dma_cmd_trigger = DSI_TRIGGER_NONE;
+		} else if (!strcmp(trig, "trigger_te")) {
+			host->dma_cmd_trigger = DSI_TRIGGER_TE;
+		} else if (!strcmp(trig, "trigger_sw")) {
+			host->dma_cmd_trigger = DSI_TRIGGER_SW;
+		} else if (!strcmp(trig, "trigger_sw_seof")) {
+			host->dma_cmd_trigger = DSI_TRIGGER_SW_SEOF;
+		} else if (!strcmp(trig, "trigger_sw_te")) {
+			host->dma_cmd_trigger = DSI_TRIGGER_SW_TE;
+		} else {
+			DSI_ERR("[%s] Unrecognized mdp trigger type (%s)\n",
+			       name, trig);
+			rc = -EINVAL;
+		}
+
+	} else {
+		DSI_DEBUG("[%s] Falling back to default MDP trigger\n", name);
+		host->dma_cmd_trigger = DSI_TRIGGER_SW;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-te-pin-select",
+			&host->te_mode);
+	if (rc) {
+		DSI_WARN("[%s] fallback to default te-pin-select\n", name);
+		host->te_mode = 1;
+		rc = 0;
+	}
+
+	return rc;
+}
+
+static int dsi_panel_parse_misc_host_config(struct dsi_host_common_cfg *host,
+					    struct dsi_parser_utils *utils,
+					    const char *name)
+{
+	u32 val = 0, line_no = 0, window = 0;
+	int rc = 0;
+	bool panel_cphy_mode = false;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-t-clk-post", &val);
+	if (!rc) {
+		host->t_clk_post = val;
+		DSI_DEBUG("[%s] t_clk_post = %d\n", name, val);
+	}
+
+	val = 0;
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-t-clk-pre", &val);
+	if (!rc) {
+		host->t_clk_pre = val;
+		DSI_DEBUG("[%s] t_clk_pre = %d\n", name, val);
+	}
+
+	host->ignore_rx_eot = utils->read_bool(utils->data,
+						"qcom,mdss-dsi-rx-eot-ignore");
+
+	host->append_tx_eot = utils->read_bool(utils->data,
+						"qcom,mdss-dsi-tx-eot-append");
+
+	host->ext_bridge_mode = utils->read_bool(utils->data,
+					"qcom,mdss-dsi-ext-bridge-mode");
+
+	host->force_hs_clk_lane = utils->read_bool(utils->data,
+					"qcom,mdss-dsi-force-clock-lane-hs");
+	panel_cphy_mode = utils->read_bool(utils->data,
+					"qcom,panel-cphy-mode");
+	host->phy_type = panel_cphy_mode ? DSI_PHY_TYPE_CPHY
+						: DSI_PHY_TYPE_DPHY;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-dma-schedule-line",
+				  &line_no);
+	if (rc)
+		host->dma_sched_line = 0;
+	else
+		host->dma_sched_line = line_no;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-dma-schedule-window",
+				  &window);
+	if (rc)
+		host->dma_sched_window = 0;
+	else
+		host->dma_sched_window = window;
+
+	DSI_DEBUG("[%s] DMA scheduling parameters Line: %d Window: %d\n", name,
+			host->dma_sched_line, host->dma_sched_window);
+	return 0;
+}
+
+static void dsi_panel_parse_split_link_config(struct dsi_host_common_cfg *host,
+					struct dsi_parser_utils *utils,
+					const char *name)
+{
+	int rc = 0;
+	u32 val = 0;
+	bool supported = false;
+	struct dsi_split_link_config *split_link = &host->split_link;
+
+	supported = utils->read_bool(utils->data, "qcom,split-link-enabled");
+
+	if (!supported) {
+		DSI_DEBUG("[%s] Split link is not supported\n", name);
+		split_link->split_link_enabled = false;
+		return;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,sublinks-count", &val);
+	if (rc || val < 1) {
+		DSI_DEBUG("[%s] Using default sublinks count\n", name);
+		split_link->num_sublinks = 2;
+	} else {
+		split_link->num_sublinks = val;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,lanes-per-sublink", &val);
+	if (rc || val < 1) {
+		DSI_DEBUG("[%s] Using default lanes per sublink\n", name);
+		split_link->lanes_per_sublink = 2;
+	} else {
+		split_link->lanes_per_sublink = val;
+	}
+
+	DSI_DEBUG("[%s] Split link is supported %d-%d\n", name,
+		split_link->num_sublinks, split_link->lanes_per_sublink);
+	split_link->split_link_enabled = true;
+}
+
+static int dsi_panel_parse_host_config(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	rc = dsi_panel_parse_pixel_format(&panel->host_config, utils,
+					  panel->name);
+	if (rc) {
+		DSI_ERR("[%s] failed to get pixel format, rc=%d\n",
+		panel->name, rc);
+		goto error;
+	}
+
+	rc = dsi_panel_parse_lane_states(&panel->host_config, utils,
+					 panel->name);
+	if (rc) {
+		DSI_ERR("[%s] failed to parse lane states, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+
+	rc = dsi_panel_parse_color_swap(&panel->host_config, utils,
+					panel->name);
+	if (rc) {
+		DSI_ERR("[%s] failed to parse color swap config, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+
+	rc = dsi_panel_parse_triggers(&panel->host_config, utils,
+				      panel->name);
+	if (rc) {
+		DSI_ERR("[%s] failed to parse triggers, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+
+	rc = dsi_panel_parse_misc_host_config(&panel->host_config, utils,
+					      panel->name);
+	if (rc) {
+		DSI_ERR("[%s] failed to parse misc host config, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+
+	dsi_panel_parse_split_link_config(&panel->host_config, utils,
+						panel->name);
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_qsync_caps(struct dsi_panel *panel,
+				     struct device_node *of_node)
+{
+	int rc = 0;
+	u32 val = 0;
+
+	rc = of_property_read_u32(of_node,
+				  "qcom,mdss-dsi-qsync-min-refresh-rate",
+				  &val);
+	if (rc)
+		DSI_DEBUG("[%s] qsync min fps not defined rc:%d\n",
+			panel->name, rc);
+
+	panel->qsync_min_fps = val;
+
+	return rc;
+}
+
+static int dsi_panel_parse_dyn_clk_caps(struct dsi_panel *panel)
+{
+	int rc = 0;
+	bool supported = false;
+	struct dsi_dyn_clk_caps *dyn_clk_caps = &panel->dyn_clk_caps;
+	struct dsi_parser_utils *utils = &panel->utils;
+	const char *name = panel->name;
+	const char *type;
+
+	supported = utils->read_bool(utils->data, "qcom,dsi-dyn-clk-enable");
+
+	if (!supported) {
+		dyn_clk_caps->dyn_clk_support = false;
+		return rc;
+	}
+
+	dyn_clk_caps->bit_clk_list_len = utils->count_u32_elems(utils->data,
+			"qcom,dsi-dyn-clk-list");
+
+	if (dyn_clk_caps->bit_clk_list_len < 1) {
+		DSI_ERR("[%s] failed to get supported bit clk list\n", name);
+		return -EINVAL;
+	}
+
+	dyn_clk_caps->bit_clk_list = kcalloc(dyn_clk_caps->bit_clk_list_len,
+			sizeof(u32), GFP_KERNEL);
+	if (!dyn_clk_caps->bit_clk_list)
+		return -ENOMEM;
+
+	rc = utils->read_u32_array(utils->data, "qcom,dsi-dyn-clk-list",
+			dyn_clk_caps->bit_clk_list,
+			dyn_clk_caps->bit_clk_list_len);
+
+	if (rc) {
+		DSI_ERR("[%s] failed to parse supported bit clk list\n", name);
+		return -EINVAL;
+	}
+
+	dyn_clk_caps->dyn_clk_support = true;
+
+	type = utils->get_property(utils->data,
+		"qcom,dsi-dyn-clk-type", NULL);
+	if (!type) {
+		dyn_clk_caps->type = DSI_DYN_CLK_TYPE_LEGACY;
+		dyn_clk_caps->maintain_const_fps = false;
+		return 0;
+	}
+	if (!strcmp(type, "constant-fps-adjust-hfp")) {
+		dyn_clk_caps->type = DSI_DYN_CLK_TYPE_CONST_FPS_ADJUST_HFP;
+		dyn_clk_caps->maintain_const_fps = true;
+	} else if (!strcmp(type, "constant-fps-adjust-vfp")) {
+		dyn_clk_caps->type = DSI_DYN_CLK_TYPE_CONST_FPS_ADJUST_VFP;
+		dyn_clk_caps->maintain_const_fps = true;
+	} else {
+		dyn_clk_caps->type = DSI_DYN_CLK_TYPE_LEGACY;
+		dyn_clk_caps->maintain_const_fps = false;
+	}
+	DSI_DEBUG("Dynamic clock type is [%s]\n", type);
+	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;
+	bool supported = false;
+	struct dsi_dfps_capabilities *dfps_caps = &panel->dfps_caps;
+	struct dsi_parser_utils *utils = &panel->utils;
+	const char *name = panel->name;
+	const char *type;
+	u32 i;
+
+	supported = utils->read_bool(utils->data,
+			"qcom,mdss-dsi-pan-enable-dynamic-fps");
+
+	if (!supported) {
+		DSI_DEBUG("[%s] DFPS is not supported\n", name);
+		dfps_caps->dfps_support = false;
+		return rc;
+	}
+
+	type = utils->get_property(utils->data,
+			"qcom,mdss-dsi-pan-fps-update", NULL);
+	if (!type) {
+		DSI_ERR("[%s] dfps type not defined\n", name);
+		rc = -EINVAL;
+		goto error;
+	} else if (!strcmp(type, "dfps_suspend_resume_mode")) {
+		dfps_caps->type = DSI_DFPS_SUSPEND_RESUME;
+	} else if (!strcmp(type, "dfps_immediate_clk_mode")) {
+		dfps_caps->type = DSI_DFPS_IMMEDIATE_CLK;
+	} else if (!strcmp(type, "dfps_immediate_porch_mode_hfp")) {
+		dfps_caps->type = DSI_DFPS_IMMEDIATE_HFP;
+	} else if (!strcmp(type, "dfps_immediate_porch_mode_vfp")) {
+		dfps_caps->type = DSI_DFPS_IMMEDIATE_VFP;
+	} else {
+		DSI_ERR("[%s] dfps type is not recognized\n", name);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	dfps_caps->dfps_list_len = utils->count_u32_elems(utils->data,
+				  "qcom,dsi-supported-dfps-list");
+	if (dfps_caps->dfps_list_len < 1) {
+		DSI_ERR("[%s] dfps refresh list not present\n", name);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	dfps_caps->dfps_list = kcalloc(dfps_caps->dfps_list_len, sizeof(u32),
+			GFP_KERNEL);
+	if (!dfps_caps->dfps_list) {
+		rc = -ENOMEM;
+		goto error;
+	}
+
+	rc = utils->read_u32_array(utils->data,
+			"qcom,dsi-supported-dfps-list",
+			dfps_caps->dfps_list,
+			dfps_caps->dfps_list_len);
+	if (rc) {
+		DSI_ERR("[%s] dfps refresh rate list parse failed\n", name);
+		rc = -EINVAL;
+		goto error;
+	}
+	dfps_caps->dfps_support = true;
+
+	/* calculate max and min fps */
+	dfps_caps->max_refresh_rate = dfps_caps->dfps_list[0];
+	dfps_caps->min_refresh_rate = dfps_caps->dfps_list[0];
+
+	for (i = 1; i < dfps_caps->dfps_list_len; i++) {
+		if (dfps_caps->dfps_list[i] < dfps_caps->min_refresh_rate)
+			dfps_caps->min_refresh_rate = dfps_caps->dfps_list[i];
+		else if (dfps_caps->dfps_list[i] > dfps_caps->max_refresh_rate)
+			dfps_caps->max_refresh_rate = dfps_caps->dfps_list[i];
+	}
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_video_host_config(struct dsi_video_engine_cfg *cfg,
+					     struct dsi_parser_utils *utils,
+					     const char *name)
+{
+	int rc = 0;
+	const char *traffic_mode;
+	u32 vc_id = 0;
+	u32 val = 0;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-h-sync-pulse", &val);
+	if (rc) {
+		DSI_DEBUG("[%s] fallback to default h-sync-pulse\n", name);
+		cfg->pulse_mode_hsa_he = false;
+	} else if (val == 1) {
+		cfg->pulse_mode_hsa_he = true;
+	} else if (val == 0) {
+		cfg->pulse_mode_hsa_he = false;
+	} else {
+		DSI_ERR("[%s] Unrecognized value for mdss-dsi-h-sync-pulse\n",
+		       name);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	cfg->hfp_lp11_en = utils->read_bool(utils->data,
+						"qcom,mdss-dsi-hfp-power-mode");
+
+	cfg->hbp_lp11_en = utils->read_bool(utils->data,
+						"qcom,mdss-dsi-hbp-power-mode");
+
+	cfg->hsa_lp11_en = utils->read_bool(utils->data,
+						"qcom,mdss-dsi-hsa-power-mode");
+
+	cfg->last_line_interleave_en = utils->read_bool(utils->data,
+					"qcom,mdss-dsi-last-line-interleave");
+
+	cfg->eof_bllp_lp11_en = utils->read_bool(utils->data,
+					"qcom,mdss-dsi-bllp-eof-power-mode");
+
+	cfg->bllp_lp11_en = utils->read_bool(utils->data,
+					"qcom,mdss-dsi-bllp-power-mode");
+
+	traffic_mode = utils->get_property(utils->data,
+				       "qcom,mdss-dsi-traffic-mode",
+				       NULL);
+	if (!traffic_mode) {
+		DSI_DEBUG("[%s] Falling back to default traffic mode\n", name);
+		cfg->traffic_mode = DSI_VIDEO_TRAFFIC_SYNC_PULSES;
+	} else if (!strcmp(traffic_mode, "non_burst_sync_pulse")) {
+		cfg->traffic_mode = DSI_VIDEO_TRAFFIC_SYNC_PULSES;
+	} else if (!strcmp(traffic_mode, "non_burst_sync_event")) {
+		cfg->traffic_mode = DSI_VIDEO_TRAFFIC_SYNC_START_EVENTS;
+	} else if (!strcmp(traffic_mode, "burst_mode")) {
+		cfg->traffic_mode = DSI_VIDEO_TRAFFIC_BURST_MODE;
+	} else {
+		DSI_ERR("[%s] Unrecognized traffic mode-%s\n", name,
+		       traffic_mode);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-virtual-channel-id",
+				  &vc_id);
+	if (rc) {
+		DSI_DEBUG("[%s] Fallback to default vc id\n", name);
+		cfg->vc_id = 0;
+	} else {
+		cfg->vc_id = vc_id;
+	}
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_cmd_host_config(struct dsi_cmd_engine_cfg *cfg,
+					   struct dsi_parser_utils *utils,
+					   const char *name)
+{
+	u32 val = 0;
+	int rc = 0;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-wr-mem-start", &val);
+	if (rc) {
+		DSI_DEBUG("[%s] Fallback to default wr-mem-start\n", name);
+		cfg->wr_mem_start = 0x2C;
+	} else {
+		cfg->wr_mem_start = val;
+	}
+
+	val = 0;
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-wr-mem-continue",
+				  &val);
+	if (rc) {
+		DSI_DEBUG("[%s] Fallback to default wr-mem-continue\n", name);
+		cfg->wr_mem_continue = 0x3C;
+	} else {
+		cfg->wr_mem_continue = val;
+	}
+
+	/* TODO:  fix following */
+	cfg->max_cmd_packets_interleave = 0;
+
+	val = 0;
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-te-dcs-command",
+				  &val);
+	if (rc) {
+		DSI_DEBUG("[%s] fallback to default te-dcs-cmd\n", name);
+		cfg->insert_dcs_command = true;
+	} else if (val == 1) {
+		cfg->insert_dcs_command = true;
+	} else if (val == 0) {
+		cfg->insert_dcs_command = false;
+	} else {
+		DSI_ERR("[%s] Unrecognized value for mdss-dsi-te-dcs-command\n",
+		       name);
+		rc = -EINVAL;
+		goto error;
+	}
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_panel_mode(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_parser_utils *utils = &panel->utils;
+	bool panel_mode_switch_enabled;
+	enum dsi_op_mode panel_mode;
+	const char *mode;
+
+	mode = utils->get_property(utils->data,
+			"qcom,mdss-dsi-panel-type", NULL);
+	if (!mode) {
+		DSI_DEBUG("[%s] Fallback to default panel mode\n", panel->name);
+		panel_mode = DSI_OP_VIDEO_MODE;
+	} else if (!strcmp(mode, "dsi_video_mode")) {
+		panel_mode = DSI_OP_VIDEO_MODE;
+	} else if (!strcmp(mode, "dsi_cmd_mode")) {
+		panel_mode = DSI_OP_CMD_MODE;
+	} else {
+		DSI_ERR("[%s] Unrecognized panel type-%s\n", panel->name, mode);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	panel_mode_switch_enabled = utils->read_bool(utils->data,
+					"qcom,mdss-dsi-panel-mode-switch");
+
+	DSI_DEBUG("%s: panel operating mode switch feature %s\n", __func__,
+		(panel_mode_switch_enabled ? "enabled" : "disabled"));
+
+	if (panel_mode == DSI_OP_VIDEO_MODE || panel_mode_switch_enabled) {
+		rc = dsi_panel_parse_video_host_config(&panel->video_config,
+						       utils,
+						       panel->name);
+		if (rc) {
+			DSI_ERR("[%s] Failed to parse video host cfg, rc=%d\n",
+			       panel->name, rc);
+			goto error;
+		}
+	}
+
+	if (panel_mode == DSI_OP_CMD_MODE || panel_mode_switch_enabled) {
+		rc = dsi_panel_parse_cmd_host_config(&panel->cmd_config,
+						     utils,
+						     panel->name);
+		if (rc) {
+			DSI_ERR("[%s] Failed to parse cmd host config, rc=%d\n",
+			       panel->name, rc);
+			goto error;
+		}
+	}
+
+	panel->poms_align_vsync = utils->read_bool(utils->data,
+					"qcom,poms-align-panel-vsync");
+	panel->panel_mode = panel_mode;
+	panel->panel_mode_switch_enabled = panel_mode_switch_enabled;
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_phy_props(struct dsi_panel *panel)
+{
+	int rc = 0;
+	u32 val = 0;
+	const char *str;
+	struct dsi_panel_phy_props *props = &panel->phy_props;
+	struct dsi_parser_utils *utils = &panel->utils;
+	const char *name = panel->name;
+
+	rc = utils->read_u32(utils->data,
+		  "qcom,mdss-pan-physical-width-dimension", &val);
+	if (rc) {
+		DSI_DEBUG("[%s] Physical panel width is not defined\n", name);
+		props->panel_width_mm = 0;
+		rc = 0;
+	} else {
+		props->panel_width_mm = val;
+	}
+
+	rc = utils->read_u32(utils->data,
+				  "qcom,mdss-pan-physical-height-dimension",
+				  &val);
+	if (rc) {
+		DSI_DEBUG("[%s] Physical panel height is not defined\n", name);
+		props->panel_height_mm = 0;
+		rc = 0;
+	} else {
+		props->panel_height_mm = val;
+	}
+
+	str = utils->get_property(utils->data,
+			"qcom,mdss-dsi-panel-orientation", NULL);
+	if (!str) {
+		props->rotation = DSI_PANEL_ROTATE_NONE;
+	} else if (!strcmp(str, "180")) {
+		props->rotation = DSI_PANEL_ROTATE_HV_FLIP;
+	} else if (!strcmp(str, "hflip")) {
+		props->rotation = DSI_PANEL_ROTATE_H_FLIP;
+	} else if (!strcmp(str, "vflip")) {
+		props->rotation = DSI_PANEL_ROTATE_V_FLIP;
+	} else {
+		DSI_ERR("[%s] Unrecognized panel rotation-%s\n", name, str);
+		rc = -EINVAL;
+		goto error;
+	}
+error:
+	return rc;
+}
+const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
+	"qcom,mdss-dsi-pre-on-command",
+	"qcom,mdss-dsi-on-command",
+	"qcom,mdss-dsi-post-panel-on-command",
+	"qcom,mdss-dsi-pre-off-command",
+	"qcom,mdss-dsi-off-command",
+	"qcom,mdss-dsi-post-off-command",
+	"qcom,mdss-dsi-pre-res-switch",
+	"qcom,mdss-dsi-res-switch",
+	"qcom,mdss-dsi-post-res-switch",
+	"qcom,cmd-to-video-mode-switch-commands",
+	"qcom,cmd-to-video-mode-post-switch-commands",
+	"qcom,video-to-cmd-mode-switch-commands",
+	"qcom,video-to-cmd-mode-post-switch-commands",
+	"qcom,mdss-dsi-panel-status-command",
+	"qcom,mdss-dsi-lp1-command",
+	"qcom,mdss-dsi-lp2-command",
+	"qcom,mdss-dsi-nolp-command",
+	"PPS not parsed from DTSI, generated dynamically",
+	"ROI not parsed from DTSI, generated dynamically",
+	"qcom,mdss-dsi-timing-switch-command",
+	"qcom,mdss-dsi-post-mode-switch-on-command",
+	"qcom,mdss-dsi-qsync-on-commands",
+	"qcom,mdss-dsi-qsync-off-commands",
+};
+
+const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
+	"qcom,mdss-dsi-pre-on-command-state",
+	"qcom,mdss-dsi-on-command-state",
+	"qcom,mdss-dsi-post-on-command-state",
+	"qcom,mdss-dsi-pre-off-command-state",
+	"qcom,mdss-dsi-off-command-state",
+	"qcom,mdss-dsi-post-off-command-state",
+	"qcom,mdss-dsi-pre-res-switch-state",
+	"qcom,mdss-dsi-res-switch-state",
+	"qcom,mdss-dsi-post-res-switch-state",
+	"qcom,cmd-to-video-mode-switch-commands-state",
+	"qcom,cmd-to-video-mode-post-switch-commands-state",
+	"qcom,video-to-cmd-mode-switch-commands-state",
+	"qcom,video-to-cmd-mode-post-switch-commands-state",
+	"qcom,mdss-dsi-panel-status-command-state",
+	"qcom,mdss-dsi-lp1-command-state",
+	"qcom,mdss-dsi-lp2-command-state",
+	"qcom,mdss-dsi-nolp-command-state",
+	"PPS not parsed from DTSI, generated dynamically",
+	"ROI not parsed from DTSI, generated dynamically",
+	"qcom,mdss-dsi-timing-switch-command-state",
+	"qcom,mdss-dsi-post-mode-switch-on-command-state",
+	"qcom,mdss-dsi-qsync-on-commands-state",
+	"qcom,mdss-dsi-qsync-off-commands-state",
+};
+
+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;
+
+	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) {
+			DSI_ERR("format error\n");
+			return -EINVAL;
+		}
+		length -= packet_length;
+		data += packet_length;
+		count++;
+	}
+
+	*cnt = count;
+	return 0;
+}
+
+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);
+		cmd[i].msg.channel = data[2];
+		cmd[i].msg.flags |= data[3];
+		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 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_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 int dsi_panel_parse_cmd_sets_sub(struct dsi_panel_cmd_set *cmd,
+					enum dsi_cmd_set_type type,
+					struct dsi_parser_utils *utils)
+{
+	int rc = 0;
+	u32 length = 0;
+	const char *data;
+	const char *state;
+	u32 packet_count = 0;
+
+	data = utils->get_property(utils->data, cmd_set_prop_map[type],
+			&length);
+	if (!data) {
+		DSI_DEBUG("%s commands not defined\n", cmd_set_prop_map[type]);
+		rc = -ENOTSUPP;
+		goto error;
+	}
+
+	DSI_DEBUG("type=%d, name=%s, length=%d\n", type,
+		cmd_set_prop_map[type], length);
+
+	print_hex_dump_debug("", DUMP_PREFIX_NONE,
+		       8, 1, data, length, false);
+
+	rc = dsi_panel_get_cmd_pkt_count(data, length, &packet_count);
+	if (rc) {
+		DSI_ERR("commands failed, rc=%d\n", rc);
+		goto error;
+	}
+	DSI_DEBUG("[%s] packet-count=%d, %d\n", cmd_set_prop_map[type],
+		packet_count, length);
+
+	rc = dsi_panel_alloc_cmd_packets(cmd, packet_count);
+	if (rc) {
+		DSI_ERR("failed to allocate cmd packets, rc=%d\n", rc);
+		goto error;
+	}
+
+	rc = dsi_panel_create_cmd_packets(data, length, packet_count,
+					  cmd->cmds);
+	if (rc) {
+		DSI_ERR("failed to create cmd packets, rc=%d\n", rc);
+		goto error_free_mem;
+	}
+
+	state = utils->get_property(utils->data, cmd_set_state_map[type], NULL);
+	if (!state || !strcmp(state, "dsi_lp_mode")) {
+		cmd->state = DSI_CMD_SET_STATE_LP;
+	} else if (!strcmp(state, "dsi_hs_mode")) {
+		cmd->state = DSI_CMD_SET_STATE_HS;
+	} else {
+		DSI_ERR("[%s] command state unrecognized-%s\n",
+		       cmd_set_state_map[type], state);
+		goto error_free_mem;
+	}
+
+	return rc;
+error_free_mem:
+	kfree(cmd->cmds);
+	cmd->cmds = NULL;
+error:
+	return rc;
+
+}
+
+static int dsi_panel_parse_cmd_sets(
+		struct dsi_display_mode_priv_info *priv_info,
+		struct dsi_parser_utils *utils)
+{
+	int rc = 0;
+	struct dsi_panel_cmd_set *set;
+	u32 i;
+
+	if (!priv_info) {
+		DSI_ERR("invalid mode priv info\n");
+		return -EINVAL;
+	}
+
+	for (i = DSI_CMD_SET_PRE_ON; i < DSI_CMD_SET_MAX; i++) {
+		set = &priv_info->cmd_sets[i];
+		set->type = i;
+		set->count = 0;
+
+		if (i == DSI_CMD_SET_PPS) {
+			rc = dsi_panel_alloc_cmd_packets(set, 1);
+			if (rc)
+				DSI_ERR("failed to allocate cmd set %d, rc = %d\n",
+					i, rc);
+			set->state = DSI_CMD_SET_STATE_LP;
+		} else {
+			rc = dsi_panel_parse_cmd_sets_sub(set, i, utils);
+			if (rc)
+				DSI_DEBUG("failed to parse set %d\n", i);
+		}
+	}
+
+	rc = 0;
+	return rc;
+}
+
+static int dsi_panel_parse_reset_sequence(struct dsi_panel *panel)
+{
+	int rc = 0;
+	int i;
+	u32 length = 0;
+	u32 count = 0;
+	u32 size = 0;
+	u32 *arr_32 = NULL;
+	const u32 *arr;
+	struct dsi_parser_utils *utils = &panel->utils;
+	struct dsi_reset_seq *seq;
+
+	if (panel->host_config.ext_bridge_mode)
+		return 0;
+
+	arr = utils->get_property(utils->data,
+			"qcom,mdss-dsi-reset-sequence", &length);
+	if (!arr) {
+		DSI_ERR("[%s] dsi-reset-sequence not found\n", panel->name);
+		rc = -EINVAL;
+		goto error;
+	}
+	if (length & 0x1) {
+		DSI_ERR("[%s] syntax error for dsi-reset-sequence\n",
+		       panel->name);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	DSI_DEBUG("RESET SEQ LENGTH = %d\n", length);
+	length = length / sizeof(u32);
+
+	size = length * sizeof(u32);
+
+	arr_32 = kzalloc(size, GFP_KERNEL);
+	if (!arr_32) {
+		rc = -ENOMEM;
+		goto error;
+	}
+
+	rc = utils->read_u32_array(utils->data, "qcom,mdss-dsi-reset-sequence",
+					arr_32, length);
+	if (rc) {
+		DSI_ERR("[%s] cannot read dso-reset-seqience\n", panel->name);
+		goto error_free_arr_32;
+	}
+
+	count = length / 2;
+	size = count * sizeof(*seq);
+	seq = kzalloc(size, GFP_KERNEL);
+	if (!seq) {
+		rc = -ENOMEM;
+		goto error_free_arr_32;
+	}
+
+	panel->reset_config.sequence = seq;
+	panel->reset_config.count = count;
+
+	for (i = 0; i < length; i += 2) {
+		seq->level = arr_32[i];
+		seq->sleep_ms = arr_32[i + 1];
+		seq++;
+	}
+
+
+error_free_arr_32:
+	kfree(arr_32);
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
+{
+	struct dsi_parser_utils *utils = &panel->utils;
+	const char *string;
+	int i, rc = 0;
+
+	panel->ulps_feature_enabled =
+		utils->read_bool(utils->data, "qcom,ulps-enabled");
+
+	DSI_DEBUG("%s: ulps feature %s\n", __func__,
+		(panel->ulps_feature_enabled ? "enabled" : "disabled"));
+
+	panel->ulps_suspend_enabled =
+		utils->read_bool(utils->data, "qcom,suspend-ulps-enabled");
+
+	DSI_DEBUG("%s: ulps during suspend feature %s\n", __func__,
+		(panel->ulps_suspend_enabled ? "enabled" : "disabled"));
+
+	panel->te_using_watchdog_timer = utils->read_bool(utils->data,
+					"qcom,mdss-dsi-te-using-wd");
+
+	panel->sync_broadcast_en = utils->read_bool(utils->data,
+			"qcom,cmd-sync-wait-broadcast");
+
+	panel->lp11_init = utils->read_bool(utils->data,
+			"qcom,mdss-dsi-lp11-init");
+
+	panel->spr_info.enable = false;
+	panel->spr_info.pack_type = MSM_DISPLAY_SPR_TYPE_MAX;
+
+	rc = utils->read_string(utils->data, "qcom,spr-pack-type", &string);
+	if (!rc) {
+		// find match for pack-type string
+		for (i = 0; i < MSM_DISPLAY_SPR_TYPE_MAX; i++) {
+			if (msm_spr_pack_type_str[i] &&
+				(!strcmp(string, msm_spr_pack_type_str[i]))) {
+				panel->spr_info.enable = true;
+				panel->spr_info.pack_type = i;
+				break;
+			}
+		}
+	}
+
+	pr_debug("%s source side spr packing, pack-type %s\n",
+		panel->spr_info.enable ? "enable" : "disable",
+		panel->spr_info.enable ?
+		msm_spr_pack_type_str[panel->spr_info.pack_type] : "none");
+
+
+	return 0;
+}
+
+static int dsi_panel_parse_jitter_config(
+				struct dsi_display_mode *mode,
+				struct dsi_parser_utils *utils)
+{
+	int rc;
+	struct dsi_display_mode_priv_info *priv_info;
+	u32 jitter[DEFAULT_PANEL_JITTER_ARRAY_SIZE] = {0, 0};
+	u64 jitter_val = 0;
+
+	priv_info = mode->priv_info;
+
+	rc = utils->read_u32_array(utils->data, "qcom,mdss-dsi-panel-jitter",
+				jitter, DEFAULT_PANEL_JITTER_ARRAY_SIZE);
+	if (rc) {
+		DSI_DEBUG("panel jitter not defined rc=%d\n", rc);
+	} else {
+		jitter_val = jitter[0];
+		jitter_val = div_u64(jitter_val, jitter[1]);
+	}
+
+	if (rc || !jitter_val || (jitter_val > MAX_PANEL_JITTER)) {
+		priv_info->panel_jitter_numer = DEFAULT_PANEL_JITTER_NUMERATOR;
+		priv_info->panel_jitter_denom =
+					DEFAULT_PANEL_JITTER_DENOMINATOR;
+	} else {
+		priv_info->panel_jitter_numer = jitter[0];
+		priv_info->panel_jitter_denom = jitter[1];
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-panel-prefill-lines",
+				  &priv_info->panel_prefill_lines);
+	if (rc) {
+		DSI_DEBUG("panel prefill lines are not defined rc=%d\n", rc);
+		priv_info->panel_prefill_lines = mode->timing.v_back_porch +
+			mode->timing.v_sync_width + mode->timing.v_front_porch;
+	} else if (priv_info->panel_prefill_lines >=
+					DSI_V_TOTAL(&mode->timing)) {
+		DSI_DEBUG("invalid prefill lines config=%d setting to:%d\n",
+		priv_info->panel_prefill_lines, DEFAULT_PANEL_PREFILL_LINES);
+
+		priv_info->panel_prefill_lines = DEFAULT_PANEL_PREFILL_LINES;
+	}
+
+	return 0;
+}
+
+static int dsi_panel_parse_power_cfg(struct dsi_panel *panel)
+{
+	int rc = 0;
+	char *supply_name;
+
+	if (panel->host_config.ext_bridge_mode)
+		return 0;
+
+	if (!strcmp(panel->type, "primary"))
+		supply_name = "qcom,panel-supply-entries";
+	else
+		supply_name = "qcom,panel-sec-supply-entries";
+
+	rc = dsi_pwr_of_get_vreg_data(&panel->utils,
+			&panel->power_info, supply_name);
+	if (rc) {
+		DSI_ERR("[%s] failed to parse vregs\n", panel->name);
+		goto error;
+	}
+
+error:
+	return rc;
+}
+
+int dsi_panel_get_io_resources(struct dsi_panel *panel,
+		struct msm_io_res *io_res)
+{
+	struct list_head temp_head;
+	struct msm_io_mem_entry *io_mem, *pos, *tmp;
+	struct list_head *mem_list = &io_res->mem;
+	int i, rc = 0, address_count, pin_count;
+	u32 *pins = NULL, *address = NULL;
+	u32 base, size;
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	INIT_LIST_HEAD(&temp_head);
+
+	address_count = utils->count_u32_elems(utils->data,
+				"qcom,dsi-panel-gpio-address");
+	if (address_count != 2) {
+		DSI_DEBUG("panel gpio address not defined\n");
+		return 0;
+	}
+
+	address =  kzalloc(sizeof(u32) * address_count, GFP_KERNEL);
+	if (!address)
+		return -ENOMEM;
+
+	rc = utils->read_u32_array(utils->data, "qcom,dsi-panel-gpio-address",
+				address, address_count);
+	if (rc) {
+		DSI_ERR("panel gpio address not defined correctly\n");
+		goto end;
+	}
+	base = address[0];
+	size = address[1];
+
+	pin_count = utils->count_u32_elems(utils->data,
+				"qcom,dsi-panel-gpio-pins");
+	if (pin_count < 0) {
+		DSI_ERR("panel gpio pins not defined\n");
+		rc = pin_count;
+		goto end;
+	}
+
+	pins =  kzalloc(sizeof(u32) * pin_count, GFP_KERNEL);
+	if (!pins) {
+		rc = -ENOMEM;
+		goto end;
+	}
+
+	rc = utils->read_u32_array(utils->data, "qcom,dsi-panel-gpio-pins",
+				pins, pin_count);
+	if (rc) {
+		DSI_ERR("panel gpio pins not defined correctly\n");
+		goto end;
+	}
+
+	for (i = 0; i < pin_count; i++) {
+		io_mem = kzalloc(sizeof(*io_mem), GFP_KERNEL);
+		if (!io_mem) {
+			rc = -ENOMEM;
+			goto parse_fail;
+		}
+
+		io_mem->base = base + (pins[i] * size);
+		io_mem->size = size;
+
+		list_add(&io_mem->list, &temp_head);
+	}
+
+	list_splice(&temp_head, mem_list);
+	goto end;
+
+parse_fail:
+	list_for_each_entry_safe(pos, tmp, &temp_head, list) {
+		list_del(&pos->list);
+		kzfree(pos);
+	}
+end:
+	kzfree(pins);
+	kzfree(address);
+	return rc;
+}
+
+static int dsi_panel_parse_gpios(struct dsi_panel *panel)
+{
+	int rc = 0;
+	const char *data;
+	struct dsi_parser_utils *utils = &panel->utils;
+	char *reset_gpio_name, *mode_set_gpio_name;
+
+	if (!strcmp(panel->type, "primary")) {
+		reset_gpio_name = "qcom,platform-reset-gpio";
+		mode_set_gpio_name = "qcom,panel-mode-gpio";
+	} else {
+		reset_gpio_name = "qcom,platform-sec-reset-gpio";
+		mode_set_gpio_name = "qcom,panel-sec-mode-gpio";
+	}
+
+	panel->reset_config.reset_gpio = utils->get_named_gpio(utils->data,
+					      reset_gpio_name, 0);
+	if (!gpio_is_valid(panel->reset_config.reset_gpio) &&
+		!panel->host_config.ext_bridge_mode) {
+		rc = panel->reset_config.reset_gpio;
+		DSI_ERR("[%s] failed get reset gpio, rc=%d\n", panel->name, rc);
+		goto error;
+	}
+
+	panel->reset_config.disp_en_gpio = utils->get_named_gpio(utils->data,
+						"qcom,5v-boost-gpio",
+						0);
+	if (!gpio_is_valid(panel->reset_config.disp_en_gpio)) {
+		DSI_DEBUG("[%s] 5v-boot-gpio is not set, rc=%d\n",
+			 panel->name, rc);
+		panel->reset_config.disp_en_gpio =
+				utils->get_named_gpio(utils->data,
+					"qcom,platform-en-gpio", 0);
+		if (!gpio_is_valid(panel->reset_config.disp_en_gpio)) {
+			DSI_DEBUG("[%s] platform-en-gpio is not set, rc=%d\n",
+				 panel->name, rc);
+		}
+	}
+
+	panel->reset_config.lcd_mode_sel_gpio = utils->get_named_gpio(
+		utils->data, mode_set_gpio_name, 0);
+	if (!gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))
+		DSI_DEBUG("mode gpio not specified\n");
+
+	DSI_DEBUG("mode gpio=%d\n", panel->reset_config.lcd_mode_sel_gpio);
+
+	data = utils->get_property(utils->data,
+		"qcom,mdss-dsi-mode-sel-gpio-state", NULL);
+	if (data) {
+		if (!strcmp(data, "single_port"))
+			panel->reset_config.mode_sel_state =
+				MODE_SEL_SINGLE_PORT;
+		else if (!strcmp(data, "dual_port"))
+			panel->reset_config.mode_sel_state =
+				MODE_SEL_DUAL_PORT;
+		else if (!strcmp(data, "high"))
+			panel->reset_config.mode_sel_state =
+				MODE_GPIO_HIGH;
+		else if (!strcmp(data, "low"))
+			panel->reset_config.mode_sel_state =
+				MODE_GPIO_LOW;
+	} else {
+		/* Set default mode as SPLIT mode */
+		panel->reset_config.mode_sel_state = MODE_SEL_DUAL_PORT;
+	}
+
+	/* TODO:  release memory */
+	rc = dsi_panel_parse_reset_sequence(panel);
+	if (rc) {
+		DSI_ERR("[%s] failed to parse reset sequence, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+
+	panel->panel_test_gpio = utils->get_named_gpio(utils->data,
+					"qcom,mdss-dsi-panel-test-pin",
+					0);
+	if (!gpio_is_valid(panel->panel_test_gpio))
+		DSI_DEBUG("%s:%d panel test gpio not specified\n", __func__,
+			 __LINE__);
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_bl_pwm_config(struct dsi_panel *panel)
+{
+	int rc = 0;
+	u32 val;
+	struct dsi_backlight_config *config = &panel->bl_config;
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	rc = utils->read_u32(utils->data, "qcom,bl-pmic-pwm-period-usecs",
+				  &val);
+	if (rc) {
+		DSI_ERR("bl-pmic-pwm-period-usecs is not defined, rc=%d\n", rc);
+		goto error;
+	}
+	config->pwm_period_usecs = val;
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
+{
+	int rc = 0;
+	u32 val = 0;
+	const char *bl_type = NULL;
+	const char *data = NULL;
+	const char *state = NULL;
+	struct dsi_parser_utils *utils = &panel->utils;
+	char *bl_name = NULL;
+
+	if (!strcmp(panel->type, "primary"))
+		bl_name = "qcom,mdss-dsi-bl-pmic-control-type";
+	else
+		bl_name = "qcom,mdss-dsi-sec-bl-pmic-control-type";
+
+	bl_type = utils->get_property(utils->data, bl_name, NULL);
+	if (!bl_type) {
+		panel->bl_config.type = DSI_BACKLIGHT_UNKNOWN;
+	} else if (!strcmp(bl_type, "bl_ctrl_pwm")) {
+		panel->bl_config.type = DSI_BACKLIGHT_PWM;
+	} else if (!strcmp(bl_type, "bl_ctrl_wled")) {
+		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 {
+		DSI_DEBUG("[%s] bl-pmic-control-type unknown-%s\n",
+			 panel->name, bl_type);
+		panel->bl_config.type = DSI_BACKLIGHT_UNKNOWN;
+	}
+
+	data = utils->get_property(utils->data, "qcom,bl-update-flag", NULL);
+	if (!data) {
+		panel->bl_config.bl_update = BL_UPDATE_NONE;
+	} else if (!strcmp(data, "delay_until_first_frame")) {
+		panel->bl_config.bl_update = BL_UPDATE_DELAY_UNTIL_FIRST_FRAME;
+	} else {
+		DSI_DEBUG("[%s] No valid bl-update-flag: %s\n",
+						panel->name, data);
+		panel->bl_config.bl_update = BL_UPDATE_NONE;
+	}
+
+	panel->bl_config.bl_scale = MAX_BL_SCALE_LEVEL;
+	panel->bl_config.bl_scale_sv = MAX_SV_BL_SCALE_LEVEL;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bl-min-level", &val);
+	if (rc) {
+		DSI_DEBUG("[%s] bl-min-level unspecified, defaulting to zero\n",
+			 panel->name);
+		panel->bl_config.bl_min_level = 0;
+	} else {
+		panel->bl_config.bl_min_level = val;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bl-max-level", &val);
+	if (rc) {
+		DSI_DEBUG("[%s] bl-max-level unspecified, defaulting to max level\n",
+			 panel->name);
+		panel->bl_config.bl_max_level = MAX_BL_LEVEL;
+	} else {
+		panel->bl_config.bl_max_level = val;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-brightness-max-level",
+		&val);
+	if (rc) {
+		DSI_DEBUG("[%s] brigheness-max-level unspecified, defaulting to 255\n",
+			 panel->name);
+		panel->bl_config.brightness_max_level = 255;
+		rc = 0;
+	} else {
+		panel->bl_config.brightness_max_level = val;
+	}
+
+	panel->bl_config.bl_inverted_dbv = utils->read_bool(utils->data,
+		"qcom,mdss-dsi-bl-inverted-dbv");
+
+	state = utils->get_property(utils->data, "qcom,bl-dsc-cmd-state", NULL);
+	if (!state || !strcmp(state, "dsi_hs_mode"))
+		panel->bl_config.lp_mode = false;
+	else if (!strcmp(state, "dsi_lp_mode"))
+		panel->bl_config.lp_mode = true;
+	else
+		DSI_ERR("bl-dsc-cmd-state command state unrecognized-%s\n",
+			state);
+	panel->bl_config.bl_2bytes_enable = utils->read_bool(utils->data,
+			"qcom,bklt-dcs-2bytes-enabled");
+
+	DSI_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) {
+			DSI_ERR("[%s] failed to parse pwm config, rc=%d\n",
+			       panel->name, rc);
+			goto error;
+		}
+	}
+
+	panel->bl_config.en_gpio = utils->get_named_gpio(utils->data,
+					      "qcom,platform-bklight-en-gpio",
+					      0);
+	if (!gpio_is_valid(panel->bl_config.en_gpio)) {
+		if (panel->bl_config.en_gpio == -EPROBE_DEFER) {
+			DSI_DEBUG("[%s] failed to get bklt gpio, rc=%d\n",
+					panel->name, rc);
+			rc = -EPROBE_DEFER;
+			goto error;
+		} else {
+			DSI_DEBUG("[%s] failed to get bklt gpio, rc=%d\n",
+					 panel->name, rc);
+			rc = 0;
+			goto error;
+		}
+	}
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_phy_timing(struct dsi_display_mode *mode,
+		struct dsi_parser_utils *utils)
+{
+	const char *data;
+	u32 len, i;
+	int rc = 0;
+	struct dsi_display_mode_priv_info *priv_info;
+	u64 pixel_clk_khz;
+
+	if (!mode || !mode->priv_info)
+		return -EINVAL;
+
+	priv_info = mode->priv_info;
+
+	data = utils->get_property(utils->data,
+			"qcom,mdss-dsi-panel-phy-timings", &len);
+	if (!data) {
+		DSI_DEBUG("Unable to read Phy timing settings\n");
+	} else {
+		priv_info->phy_timing_val =
+			kzalloc((sizeof(u32) * len), GFP_KERNEL);
+		if (!priv_info->phy_timing_val)
+			return -EINVAL;
+
+		for (i = 0; i < len; i++)
+			priv_info->phy_timing_val[i] = data[i];
+
+		priv_info->phy_timing_len = len;
+	}
+
+	if (mode->panel_mode == DSI_OP_VIDEO_MODE) {
+		/*
+		 *  For command mode we update the pclk as part of
+		 *  function dsi_panel_calc_dsi_transfer_time( )
+		 *  as we set it based on dsi clock or mdp transfer time.
+		 */
+		pixel_clk_khz = (dsi_h_total_dce(&mode->timing) *
+				DSI_V_TOTAL(&mode->timing) *
+				mode->timing.refresh_rate);
+		do_div(pixel_clk_khz, 1000);
+		mode->pixel_clk_khz = pixel_clk_khz;
+	}
+
+	return rc;
+}
+
+static int dsi_panel_parse_dsc_params(struct dsi_display_mode *mode,
+				struct dsi_parser_utils *utils)
+{
+	u32 data;
+	int rc = -EINVAL;
+	int intf_width;
+	const char *compression;
+	struct dsi_display_mode_priv_info *priv_info;
+
+	if (!mode || !mode->priv_info)
+		return -EINVAL;
+
+	priv_info = mode->priv_info;
+
+	priv_info->dsc_enabled = false;
+	compression = utils->get_property(utils->data,
+			"qcom,compression-mode", NULL);
+	if (compression && !strcmp(compression, "dsc"))
+		priv_info->dsc_enabled = true;
+
+	if (!priv_info->dsc_enabled) {
+		DSI_DEBUG("dsc compression is not enabled for the mode\n");
+		return 0;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-version", &data);
+	if (rc) {
+		priv_info->dsc.config.dsc_version_major = 0x1;
+		priv_info->dsc.config.dsc_version_minor = 0x1;
+		rc = 0;
+	} else {
+		/* BITS[0..3] provides minor version and BITS[4..7] provide
+		 * major version information
+		 */
+		priv_info->dsc.config.dsc_version_major = (data >> 4) & 0x0F;
+		priv_info->dsc.config.dsc_version_minor = data & 0x0F;
+		if ((priv_info->dsc.config.dsc_version_major != 0x1) &&
+				((priv_info->dsc.config.dsc_version_minor
+				  != 0x1) ||
+				 (priv_info->dsc.config.dsc_version_minor
+				  != 0x2))) {
+			DSI_ERR("%s:unsupported major:%d minor:%d version\n",
+					__func__,
+					priv_info->dsc.config.dsc_version_major,
+					priv_info->dsc.config.dsc_version_minor
+					);
+			rc = -EINVAL;
+			goto error;
+		}
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-scr-version", &data);
+	if (rc) {
+		priv_info->dsc.scr_rev = 0x0;
+		rc = 0;
+	} else {
+		priv_info->dsc.scr_rev = data & 0xff;
+		/* only one scr rev supported */
+		if (priv_info->dsc.scr_rev > 0x1) {
+			DSI_ERR("%s: DSC scr version:%d not supported\n",
+					__func__, priv_info->dsc.scr_rev);
+			rc = -EINVAL;
+			goto error;
+		}
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-slice-height", &data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,mdss-dsc-slice-height\n");
+		goto error;
+	}
+	priv_info->dsc.config.slice_height = data;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-slice-width", &data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,mdss-dsc-slice-width\n");
+		goto error;
+	}
+	priv_info->dsc.config.slice_width = data;
+
+	intf_width = mode->timing.h_active;
+	if (intf_width % priv_info->dsc.config.slice_width) {
+		DSI_ERR("invalid slice width for the intf width:%d slice width:%d\n",
+			intf_width, priv_info->dsc.config.slice_width);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	priv_info->dsc.config.pic_width = mode->timing.h_active;
+	priv_info->dsc.config.pic_height = mode->timing.v_active;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-slice-per-pkt", &data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,mdss-dsc-slice-per-pkt\n");
+		goto error;
+	} else if (!data || (data > 2)) {
+		DSI_ERR("invalid dsc slice-per-pkt:%d\n", data);
+		goto error;
+	}
+	priv_info->dsc.slice_per_pkt = data;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-bit-per-component",
+		&data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,mdss-dsc-bit-per-component\n");
+		goto error;
+	}
+	priv_info->dsc.config.bits_per_component = data;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-pps-delay-ms", &data);
+	if (rc) {
+		DSI_DEBUG("pps-delay-ms not specified, defaulting to 0\n");
+		data = 0;
+	}
+	priv_info->dsc.pps_delay_ms = data;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-bit-per-pixel",
+			&data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,mdss-dsc-bit-per-pixel\n");
+		goto error;
+	}
+	priv_info->dsc.config.bits_per_pixel = data << 4;
+
+	rc = utils->read_u32(utils->data, "qcom,src-chroma-format",
+			&data);
+	if (rc) {
+		DSI_DEBUG("failed to parse qcom,src-chroma-format\n");
+		rc = 0;
+		data = MSM_CHROMA_444;
+	}
+
+	priv_info->dsc.chroma_format = data;
+
+	rc = utils->read_u32(utils->data, "qcom,src-color-space",
+			&data);
+	if (rc) {
+		DSI_DEBUG("failed to parse qcom,src-color-space\n");
+		rc = 0;
+		data = MSM_RGB;
+	}
+
+	priv_info->dsc.source_color_space = data;
+
+	priv_info->dsc.config.block_pred_enable = utils->read_bool(utils->data,
+		"qcom,mdss-dsc-block-prediction-enable");
+
+	priv_info->dsc.config.slice_count = DIV_ROUND_UP(intf_width,
+		priv_info->dsc.config.slice_width);
+
+	rc = sde_dsc_populate_dsc_config(&priv_info->dsc.config,
+			priv_info->dsc.scr_rev);
+	if (rc) {
+		DSI_DEBUG("failed populating dsc params\n");
+		rc = -EINVAL;
+		goto error;
+	}
+
+	rc = sde_dsc_populate_dsc_private_params(&priv_info->dsc, intf_width);
+	if (rc) {
+		DSI_DEBUG("failed populating other dsc params\n");
+		rc = -EINVAL;
+		goto error;
+	}
+
+	priv_info->pclk_scale.numer =
+			priv_info->dsc.config.bits_per_pixel >> 4;
+	priv_info->pclk_scale.denom = msm_get_src_bpc(
+			priv_info->dsc.chroma_format,
+			priv_info->dsc.config.bits_per_component);
+
+	mode->timing.dsc_enabled = true;
+	mode->timing.dsc = &priv_info->dsc;
+	mode->timing.pclk_scale = priv_info->pclk_scale;
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_vdc_params(struct dsi_display_mode *mode,
+	struct dsi_parser_utils *utils, int traffic_mode, int panel_mode)
+{
+	u32 data;
+	int rc = -EINVAL;
+	const char *compression;
+	struct dsi_display_mode_priv_info *priv_info;
+	int intf_width;
+
+	if (!mode || !mode->priv_info)
+		return -EINVAL;
+
+	priv_info = mode->priv_info;
+
+	priv_info->vdc_enabled = false;
+	compression = utils->get_property(utils->data,
+			"qcom,compression-mode", NULL);
+	if (compression && !strcmp(compression, "vdc"))
+		priv_info->vdc_enabled = true;
+
+	if (!priv_info->vdc_enabled) {
+		DSI_DEBUG("vdc compression is not enabled for the mode\n");
+		return 0;
+	}
+
+	priv_info->vdc.panel_mode = panel_mode;
+	priv_info->vdc.traffic_mode = traffic_mode;
+
+	rc = utils->read_u32(utils->data, "qcom,vdc-version", &data);
+	if (rc) {
+		priv_info->vdc.version_major = 0x1;
+		priv_info->vdc.version_minor = 0x2;
+		priv_info->vdc.version_release = 0x0;
+		rc = 0;
+	} else {
+		/* BITS[0..3] provides minor version and BITS[4..7] provide
+		 * major version information
+		 */
+		priv_info->vdc.version_major = (data >> 4) & 0x0F;
+		priv_info->vdc.version_minor = data & 0x0F;
+		if ((priv_info->vdc.version_major != 0x1) &&
+				((priv_info->vdc.version_minor
+				  != 0x2))) {
+			DSI_ERR("%s:unsupported major:%d minor:%d version\n",
+					__func__,
+					priv_info->vdc.version_major,
+					priv_info->vdc.version_minor
+					);
+			rc = -EINVAL;
+			goto error;
+		}
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,vdc-version-release", &data);
+	if (rc) {
+		priv_info->vdc.version_release = 0x0;
+		rc = 0;
+	} else {
+		priv_info->vdc.version_release = data & 0xff;
+		/* only one release version is supported */
+		if (priv_info->vdc.version_release != 0x0) {
+			DSI_ERR("unsupported vdc release version %d\n",
+					priv_info->vdc.version_release);
+			rc = -EINVAL;
+			goto error;
+		}
+	}
+
+	DSI_INFO("vdc major: 0x%x minor : 0x%x release : 0x%x\n",
+			priv_info->vdc.version_major,
+			priv_info->vdc.version_minor,
+			priv_info->vdc.version_release);
+
+	rc = utils->read_u32(utils->data, "qcom,vdc-slice-height", &data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,vdc-slice-height\n");
+		goto error;
+	}
+	priv_info->vdc.slice_height = data;
+
+	/* slice height should be atleast 16 lines */
+	if (priv_info->vdc.slice_height < 16) {
+		DSI_ERR("invalid slice height %d\n",
+			priv_info->vdc.slice_height);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,vdc-slice-width", &data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,vdc-slice-width\n");
+		goto error;
+	}
+
+	priv_info->vdc.slice_width = data;
+
+	/*
+	 * slide-width should be multiple of 8
+	 * slice-width should be atlease 64 pixels
+	 */
+	if ((priv_info->vdc.slice_width & 7) ||
+		(priv_info->vdc.slice_width < 64)) {
+		DSI_ERR("invalid slice width:%d\n", priv_info->vdc.slice_width);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	rc = utils->read_u32(utils->data, "qcom,vdc-slice-per-pkt", &data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,vdc-slice-per-pkt\n");
+		goto error;
+	} else if (!data || (data > 2)) {
+		DSI_ERR("invalid vdc slice-per-pkt:%d\n", data);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	intf_width = mode->timing.h_active;
+	priv_info->vdc.slice_per_pkt = data;
+
+	priv_info->vdc.frame_width = mode->timing.h_active;
+	priv_info->vdc.frame_height = mode->timing.v_active;
+
+	rc = utils->read_u32(utils->data, "qcom,vdc-bit-per-component",
+		&data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,vdc-bit-per-component\n");
+		goto error;
+	}
+	priv_info->vdc.bits_per_component = data;
+
+	rc = utils->read_u32(utils->data, "qcom,mdss-pps-delay-ms", &data);
+	if (rc) {
+		DSI_DEBUG("pps-delay-ms not specified, defaulting to 0\n");
+		data = 0;
+	}
+	priv_info->vdc.pps_delay_ms = data;
+
+	rc = utils->read_u32(utils->data, "qcom,vdc-bit-per-pixel",
+			&data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,vdc-bit-per-pixel\n");
+		goto error;
+	}
+	priv_info->vdc.bits_per_pixel = data << 4;
+
+	rc = utils->read_u32(utils->data, "qcom,src-chroma-format",
+			&data);
+	if (rc) {
+		DSI_DEBUG("failed to parse qcom,src-chroma-format\n");
+		rc = 0;
+		data = MSM_CHROMA_444;
+	}
+	priv_info->vdc.chroma_format = data;
+
+	rc = utils->read_u32(utils->data, "qcom,src-color-space",
+			&data);
+	if (rc) {
+		DSI_DEBUG("failed to parse qcom,src-color-space\n");
+		rc = 0;
+		data = MSM_RGB;
+	}
+	priv_info->vdc.source_color_space = data;
+
+	rc = sde_vdc_populate_config(&priv_info->vdc,
+		intf_width, traffic_mode);
+	if (rc) {
+		DSI_DEBUG("failed populating vdc config\n");
+		rc = -EINVAL;
+		goto error;
+	}
+
+	priv_info->pclk_scale.numer =
+			priv_info->vdc.bits_per_pixel >> 4;
+	priv_info->pclk_scale.denom = msm_get_src_bpc(
+			priv_info->vdc.chroma_format,
+			priv_info->vdc.bits_per_component);
+
+	mode->timing.vdc_enabled = true;
+	mode->timing.vdc = &priv_info->vdc;
+	mode->timing.pclk_scale = priv_info->pclk_scale;
+
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_hdr_config(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct drm_panel_hdr_properties *hdr_prop;
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	hdr_prop = &panel->hdr_props;
+	hdr_prop->hdr_enabled = utils->read_bool(utils->data,
+		"qcom,mdss-dsi-panel-hdr-enabled");
+
+	if (hdr_prop->hdr_enabled) {
+		rc = utils->read_u32_array(utils->data,
+				"qcom,mdss-dsi-panel-hdr-color-primaries",
+				hdr_prop->display_primaries,
+				DISPLAY_PRIMARIES_MAX);
+		if (rc) {
+			DSI_ERR("%s:%d, Unable to read color primaries,rc:%u\n",
+					__func__, __LINE__, rc);
+			hdr_prop->hdr_enabled = false;
+			return rc;
+		}
+
+		rc = utils->read_u32(utils->data,
+			"qcom,mdss-dsi-panel-peak-brightness",
+			&(hdr_prop->peak_brightness));
+		if (rc) {
+			DSI_ERR("%s:%d, Unable to read hdr brightness, rc:%u\n",
+				__func__, __LINE__, rc);
+			hdr_prop->hdr_enabled = false;
+			return rc;
+		}
+
+		rc = utils->read_u32(utils->data,
+			"qcom,mdss-dsi-panel-blackness-level",
+			&(hdr_prop->blackness_level));
+		if (rc) {
+			DSI_ERR("%s:%d, Unable to read hdr brightness, rc:%u\n",
+				__func__, __LINE__, rc);
+			hdr_prop->hdr_enabled = false;
+			return rc;
+		}
+	}
+	return 0;
+}
+
+static int dsi_panel_parse_topology(
+		struct dsi_display_mode_priv_info *priv_info,
+		struct dsi_parser_utils *utils,
+		int topology_override)
+{
+	struct msm_display_topology *topology;
+	u32 top_count, top_sel, *array = NULL;
+	int i, len = 0;
+	int rc = -EINVAL;
+
+	len = utils->count_u32_elems(utils->data, "qcom,display-topology");
+	if (len <= 0 || len % TOPOLOGY_SET_LEN ||
+			len > (TOPOLOGY_SET_LEN * MAX_TOPOLOGY)) {
+		DSI_ERR("invalid topology list for the panel, rc = %d\n", rc);
+		return rc;
+	}
+
+	top_count = len / TOPOLOGY_SET_LEN;
+
+	array = kcalloc(len, sizeof(u32), GFP_KERNEL);
+	if (!array)
+		return -ENOMEM;
+
+	rc = utils->read_u32_array(utils->data,
+			"qcom,display-topology", array, len);
+	if (rc) {
+		DSI_ERR("unable to read the display topologies, rc = %d\n", rc);
+		goto read_fail;
+	}
+
+	topology = kcalloc(top_count, sizeof(*topology), GFP_KERNEL);
+	if (!topology) {
+		rc = -ENOMEM;
+		goto read_fail;
+	}
+
+	for (i = 0; i < top_count; i++) {
+		struct msm_display_topology *top = &topology[i];
+
+		top->num_lm = array[i * TOPOLOGY_SET_LEN];
+		top->num_enc = array[i * TOPOLOGY_SET_LEN + 1];
+		top->num_intf = array[i * TOPOLOGY_SET_LEN + 2];
+	}
+
+	if (topology_override >= 0 && topology_override < top_count) {
+		DSI_INFO("override topology: cfg:%d lm:%d comp_enc:%d intf:%d\n",
+			topology_override,
+			topology[topology_override].num_lm,
+			topology[topology_override].num_enc,
+			topology[topology_override].num_intf);
+		top_sel = topology_override;
+		goto parse_done;
+	}
+
+	rc = utils->read_u32(utils->data,
+			"qcom,default-topology-index", &top_sel);
+	if (rc) {
+		DSI_ERR("no default topology selected, rc = %d\n", rc);
+		goto parse_fail;
+	}
+
+	if (top_sel >= top_count) {
+		rc = -EINVAL;
+		DSI_ERR("default topology is specified is not valid, rc = %d\n",
+			rc);
+		goto parse_fail;
+	}
+
+	DSI_INFO("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);
+
+parse_done:
+	memcpy(&priv_info->topology, &topology[top_sel],
+		sizeof(struct msm_display_topology));
+parse_fail:
+	kfree(topology);
+read_fail:
+	kfree(array);
+
+	return rc;
+}
+
+static int dsi_panel_parse_roi_alignment(struct dsi_parser_utils *utils,
+					 struct msm_roi_alignment *align)
+{
+	int len = 0, rc = 0;
+	u32 value[6];
+	struct property *data;
+
+	if (!align)
+		return -EINVAL;
+
+	memset(align, 0, sizeof(*align));
+
+	data = utils->find_property(utils->data,
+			"qcom,panel-roi-alignment", &len);
+	len /= sizeof(u32);
+	if (!data) {
+		DSI_ERR("panel roi alignment not found\n");
+		rc = -EINVAL;
+	} else if (len != 6) {
+		DSI_ERR("incorrect roi alignment len %d\n", len);
+		rc = -EINVAL;
+	} else {
+		rc = utils->read_u32_array(utils->data,
+				"qcom,panel-roi-alignment", value, len);
+		if (rc)
+			DSI_DEBUG("error reading panel roi alignment values\n");
+		else {
+			align->xstart_pix_align = value[0];
+			align->ystart_pix_align = value[1];
+			align->width_pix_align = value[2];
+			align->height_pix_align = value[3];
+			align->min_width = value[4];
+			align->min_height = value[5];
+		}
+
+		DSI_INFO("roi alignment: [%d, %d, %d, %d, %d, %d]\n",
+			align->xstart_pix_align,
+			align->width_pix_align,
+			align->ystart_pix_align,
+			align->height_pix_align,
+			align->min_width,
+			align->min_height);
+	}
+
+	return rc;
+}
+
+static int dsi_panel_parse_partial_update_caps(struct dsi_display_mode *mode,
+				struct dsi_parser_utils *utils)
+{
+	struct msm_roi_caps *roi_caps = NULL;
+	const char *data;
+	int rc = 0;
+
+	if (!mode || !mode->priv_info) {
+		DSI_ERR("invalid arguments\n");
+		return -EINVAL;
+	}
+
+	roi_caps = &mode->priv_info->roi_caps;
+
+	memset(roi_caps, 0, sizeof(*roi_caps));
+
+	data = utils->get_property(utils->data,
+		"qcom,partial-update-enabled", NULL);
+	if (data) {
+		if (!strcmp(data, "dual_roi"))
+			roi_caps->num_roi = 2;
+		else if (!strcmp(data, "single_roi"))
+			roi_caps->num_roi = 1;
+		else {
+			DSI_INFO(
+			"invalid value for qcom,partial-update-enabled: %s\n",
+			data);
+			return 0;
+		}
+	} else {
+		DSI_DEBUG("partial update disabled as the property is not set\n");
+		return 0;
+	}
+
+	roi_caps->merge_rois = utils->read_bool(utils->data,
+			"qcom,partial-update-roi-merge");
+
+	roi_caps->enabled = roi_caps->num_roi > 0;
+
+	DSI_DEBUG("partial update num_rois=%d enabled=%d\n", roi_caps->num_roi,
+			roi_caps->enabled);
+
+	if (roi_caps->enabled)
+		rc = dsi_panel_parse_roi_alignment(utils,
+				&roi_caps->align);
+
+	if (rc)
+		memset(roi_caps, 0, sizeof(*roi_caps));
+
+	return rc;
+}
+
+static int dsi_panel_parse_panel_mode_caps(struct dsi_display_mode *mode,
+				struct dsi_parser_utils *utils)
+{
+	bool vid_mode_support, cmd_mode_support;
+
+	if (!mode || !mode->priv_info) {
+		DSI_ERR("invalid arguments\n");
+		return -EINVAL;
+	}
+
+	vid_mode_support = utils->read_bool(utils->data,
+				"qcom,mdss-dsi-video-mode");
+
+	cmd_mode_support = utils->read_bool(utils->data,
+				"qcom,mdss-dsi-cmd-mode");
+
+	if (cmd_mode_support)
+		mode->panel_mode = DSI_OP_CMD_MODE;
+	else if (vid_mode_support)
+		mode->panel_mode = DSI_OP_VIDEO_MODE;
+	else
+		return -EINVAL;
+
+	return 0;
+};
+
+
+static int dsi_panel_parse_dms_info(struct dsi_panel *panel)
+{
+	int dms_enabled;
+	const char *data;
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	panel->dms_mode = DSI_DMS_MODE_DISABLED;
+	dms_enabled = utils->read_bool(utils->data,
+		"qcom,dynamic-mode-switch-enabled");
+	if (!dms_enabled)
+		return 0;
+
+	data = utils->get_property(utils->data,
+			"qcom,dynamic-mode-switch-type", NULL);
+	if (data && !strcmp(data, "dynamic-resolution-switch-immediate")) {
+		panel->dms_mode = DSI_DMS_MODE_RES_SWITCH_IMMEDIATE;
+	} else {
+		DSI_ERR("[%s] unsupported dynamic switch mode: %s\n",
+							panel->name, data);
+		return -EINVAL;
+	}
+
+	return 0;
+};
+
+/*
+ * The length of all the valid values to be checked should not be greater
+ * than the length of returned data from read command.
+ */
+static bool
+dsi_panel_parse_esd_check_valid_params(struct dsi_panel *panel, u32 count)
+{
+	int i;
+	struct drm_panel_esd_config *config = &panel->esd_config;
+
+	for (i = 0; i < count; ++i) {
+		if (config->status_valid_params[i] >
+				config->status_cmds_rlen[i]) {
+			DSI_DEBUG("ignore valid params\n");
+			return false;
+		}
+	}
+
+	return true;
+}
+
+static bool dsi_panel_parse_esd_status_len(struct dsi_parser_utils *utils,
+	char *prop_key, u32 **target, u32 cmd_cnt)
+{
+	int tmp;
+
+	if (!utils->find_property(utils->data, prop_key, &tmp))
+		return false;
+
+	tmp /= sizeof(u32);
+	if (tmp != cmd_cnt) {
+		DSI_ERR("request property(%d) do not match cmd count(%d)\n",
+				tmp, cmd_cnt);
+		return false;
+	}
+
+	*target = kcalloc(tmp, sizeof(u32), GFP_KERNEL);
+	if (IS_ERR_OR_NULL(*target)) {
+		DSI_ERR("Error allocating memory for property\n");
+		return false;
+	}
+
+	if (utils->read_u32_array(utils->data, prop_key, *target, tmp)) {
+		DSI_ERR("cannot get values from dts\n");
+		kfree(*target);
+		*target = NULL;
+		return false;
+	}
+
+	return true;
+}
+
+static void dsi_panel_esd_config_deinit(struct drm_panel_esd_config *esd_config)
+{
+	kfree(esd_config->status_buf);
+	kfree(esd_config->return_buf);
+	kfree(esd_config->status_value);
+	kfree(esd_config->status_valid_params);
+	kfree(esd_config->status_cmds_rlen);
+	kfree(esd_config->status_cmd.cmds);
+}
+
+int dsi_panel_parse_esd_reg_read_configs(struct dsi_panel *panel)
+{
+	struct drm_panel_esd_config *esd_config;
+	int rc = 0;
+	u32 tmp;
+	u32 i, status_len, *lenp;
+	struct property *data;
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	if (!panel) {
+		DSI_ERR("Invalid Params\n");
+		return -EINVAL;
+	}
+
+	esd_config = &panel->esd_config;
+	if (!esd_config)
+		return -EINVAL;
+
+	dsi_panel_parse_cmd_sets_sub(&esd_config->status_cmd,
+				DSI_CMD_SET_PANEL_STATUS, utils);
+	if (!esd_config->status_cmd.count) {
+		DSI_ERR("panel status command parsing failed\n");
+		rc = -EINVAL;
+		goto error;
+	}
+
+	if (!dsi_panel_parse_esd_status_len(utils,
+		"qcom,mdss-dsi-panel-status-read-length",
+			&panel->esd_config.status_cmds_rlen,
+				esd_config->status_cmd.count)) {
+		DSI_ERR("Invalid status read length\n");
+		rc = -EINVAL;
+		goto error1;
+	}
+
+	if (dsi_panel_parse_esd_status_len(utils,
+		"qcom,mdss-dsi-panel-status-valid-params",
+			&panel->esd_config.status_valid_params,
+				esd_config->status_cmd.count)) {
+		if (!dsi_panel_parse_esd_check_valid_params(panel,
+					esd_config->status_cmd.count)) {
+			rc = -EINVAL;
+			goto error2;
+		}
+	}
+
+	status_len = 0;
+	lenp = esd_config->status_valid_params ?: esd_config->status_cmds_rlen;
+	for (i = 0; i < esd_config->status_cmd.count; ++i)
+		status_len += lenp[i];
+
+	if (!status_len) {
+		rc = -EINVAL;
+		goto error2;
+	}
+
+	/*
+	 * Some panel may need multiple read commands to properly
+	 * check panel status. Do a sanity check for proper status
+	 * value which will be compared with the value read by dsi
+	 * controller during ESD check. Also check if multiple read
+	 * commands are there then, there should be corresponding
+	 * status check values for each read command.
+	 */
+	data = utils->find_property(utils->data,
+			"qcom,mdss-dsi-panel-status-value", &tmp);
+	tmp /= sizeof(u32);
+	if (!IS_ERR_OR_NULL(data) && tmp != 0 && (tmp % status_len) == 0) {
+		esd_config->groups = tmp / status_len;
+	} else {
+		DSI_ERR("error parse panel-status-value\n");
+		rc = -EINVAL;
+		goto error2;
+	}
+
+	esd_config->status_value =
+		kzalloc(sizeof(u32) * status_len * esd_config->groups,
+			GFP_KERNEL);
+	if (!esd_config->status_value) {
+		rc = -ENOMEM;
+		goto error2;
+	}
+
+	esd_config->return_buf = kcalloc(status_len * esd_config->groups,
+			sizeof(unsigned char), GFP_KERNEL);
+	if (!esd_config->return_buf) {
+		rc = -ENOMEM;
+		goto error3;
+	}
+
+	esd_config->status_buf = kzalloc(SZ_4K, GFP_KERNEL);
+	if (!esd_config->status_buf) {
+		rc = -ENOMEM;
+		goto error4;
+	}
+
+	rc = utils->read_u32_array(utils->data,
+		"qcom,mdss-dsi-panel-status-value",
+		esd_config->status_value, esd_config->groups * status_len);
+	if (rc) {
+		DSI_DEBUG("error reading panel status values\n");
+		memset(esd_config->status_value, 0,
+				esd_config->groups * status_len);
+	}
+
+	return 0;
+
+error4:
+	kfree(esd_config->return_buf);
+error3:
+	kfree(esd_config->status_value);
+error2:
+	kfree(esd_config->status_valid_params);
+	kfree(esd_config->status_cmds_rlen);
+error1:
+	kfree(esd_config->status_cmd.cmds);
+error:
+	return rc;
+}
+
+static int dsi_panel_parse_esd_config(struct dsi_panel *panel)
+{
+	int rc = 0;
+	const char *string;
+	struct drm_panel_esd_config *esd_config;
+	struct dsi_parser_utils *utils = &panel->utils;
+	u8 *esd_mode = NULL;
+
+	esd_config = &panel->esd_config;
+	esd_config->status_mode = ESD_MODE_MAX;
+	esd_config->esd_enabled = utils->read_bool(utils->data,
+		"qcom,esd-check-enabled");
+
+	if (!esd_config->esd_enabled)
+		return 0;
+
+	rc = utils->read_string(utils->data,
+			"qcom,mdss-dsi-panel-status-check-mode", &string);
+	if (!rc) {
+		if (!strcmp(string, "bta_check")) {
+			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")) {
+			if (panel->panel_mode == DSI_OP_CMD_MODE) {
+				esd_config->status_mode = ESD_MODE_PANEL_TE;
+			} else {
+				DSI_ERR("TE-ESD not valid for video mode\n");
+				rc = -EINVAL;
+				goto error;
+			}
+		} else {
+			DSI_ERR("No valid panel-status-check-mode string\n");
+			rc = -EINVAL;
+			goto error;
+		}
+	} else {
+		DSI_DEBUG("status check method not defined!\n");
+		rc = -EINVAL;
+		goto error;
+	}
+
+	if (panel->esd_config.status_mode == ESD_MODE_REG_READ) {
+		rc = dsi_panel_parse_esd_reg_read_configs(panel);
+		if (rc) {
+			DSI_ERR("failed to parse esd reg read mode params, rc=%d\n",
+						rc);
+			goto error;
+		}
+		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) {
+		esd_mode = "te_check";
+	}
+
+	DSI_DEBUG("ESD enabled with mode: %s\n", esd_mode);
+
+	return 0;
+
+error:
+	panel->esd_config.esd_enabled = false;
+	return rc;
+}
+
+static void dsi_panel_update_util(struct dsi_panel *panel,
+				  struct device_node *parser_node)
+{
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	if (parser_node) {
+		*utils = *dsi_parser_get_parser_utils();
+		utils->data = parser_node;
+
+		DSI_DEBUG("switching to parser APIs\n");
+
+		goto end;
+	}
+
+	*utils = *dsi_parser_get_of_utils();
+	utils->data = panel->panel_of_node;
+end:
+	utils->node = panel->panel_of_node;
+}
+
+static int dsi_panel_vm_stub(struct dsi_panel *panel)
+{
+	return 0;
+}
+
+static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
+{
+	if (trusted_vm_env) {
+		panel->panel_ops.pinctrl_init = dsi_panel_vm_stub;
+		panel->panel_ops.gpio_request = dsi_panel_vm_stub;
+		panel->panel_ops.pinctrl_deinit = dsi_panel_vm_stub;
+		panel->panel_ops.gpio_release = dsi_panel_vm_stub;
+		panel->panel_ops.bl_register = dsi_panel_vm_stub;
+		panel->panel_ops.bl_unregister = dsi_panel_vm_stub;
+		panel->panel_ops.parse_gpios = dsi_panel_vm_stub;
+	} else {
+		panel->panel_ops.pinctrl_init = dsi_panel_pinctrl_init;
+		panel->panel_ops.gpio_request = dsi_panel_gpio_request;
+		panel->panel_ops.pinctrl_deinit = dsi_panel_pinctrl_deinit;
+		panel->panel_ops.gpio_release = dsi_panel_gpio_release;
+		panel->panel_ops.bl_register = dsi_panel_bl_register;
+		panel->panel_ops.bl_unregister = dsi_panel_bl_unregister;
+		panel->panel_ops.parse_gpios = dsi_panel_parse_gpios;
+	}
+}
+
+struct dsi_panel *dsi_panel_get(struct device *parent,
+				struct device_node *of_node,
+				struct device_node *parser_node,
+				const char *type,
+				int topology_override,
+				bool trusted_vm_env)
+{
+	struct dsi_panel *panel;
+	struct dsi_parser_utils *utils;
+	const char *panel_physical_type;
+	int rc = 0;
+
+	panel = kzalloc(sizeof(*panel), GFP_KERNEL);
+	if (!panel)
+		return ERR_PTR(-ENOMEM);
+
+	dsi_panel_setup_vm_ops(panel, trusted_vm_env);
+
+	panel->panel_of_node = of_node;
+	panel->parent = parent;
+	panel->type = type;
+
+	dsi_panel_update_util(panel, parser_node);
+	utils = &panel->utils;
+
+	panel->name = utils->get_property(utils->data,
+				"qcom,mdss-dsi-panel-name", NULL);
+	if (!panel->name)
+		panel->name = DSI_PANEL_DEFAULT_LABEL;
+
+	/*
+	 * Set panel type to LCD as default.
+	 */
+	panel->panel_type = DSI_DISPLAY_PANEL_TYPE_LCD;
+	panel_physical_type = utils->get_property(utils->data,
+				"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_host_config(panel);
+	if (rc) {
+		DSI_ERR("failed to parse host configuration, rc=%d\n",
+				rc);
+		goto error;
+	}
+
+	rc = dsi_panel_parse_panel_mode(panel);
+	if (rc) {
+		DSI_ERR("failed to parse panel mode configuration, rc=%d\n",
+				rc);
+		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);
+
+	rc = dsi_panel_parse_qsync_caps(panel, of_node);
+	if (rc)
+		DSI_DEBUG("failed to parse qsync features, rc=%d\n", rc);
+
+	/* allow qsync support only if DFPS is with VFP approach */
+	if ((panel->dfps_caps.dfps_support) &&
+	    !(panel->dfps_caps.type == DSI_DFPS_IMMEDIATE_VFP))
+		panel->qsync_min_fps = 0;
+
+	rc = dsi_panel_parse_dyn_clk_caps(panel);
+	if (rc)
+		DSI_ERR("failed to parse dynamic clk config, rc=%d\n", rc);
+
+	rc = dsi_panel_parse_phy_props(panel);
+	if (rc) {
+		DSI_ERR("failed to parse panel physical dimension, rc=%d\n",
+				rc);
+		goto error;
+	}
+
+	rc = panel->panel_ops.parse_gpios(panel);
+	if (rc) {
+		DSI_ERR("failed to parse panel gpios, rc=%d\n", rc);
+		goto error;
+	}
+
+	rc = dsi_panel_parse_power_cfg(panel);
+	if (rc)
+		DSI_ERR("failed to parse power config, rc=%d\n", rc);
+
+	rc = dsi_panel_parse_bl_config(panel);
+	if (rc) {
+		DSI_ERR("failed to parse backlight config, rc=%d\n", rc);
+		if (rc == -EPROBE_DEFER)
+			goto error;
+	}
+
+	rc = dsi_panel_parse_misc_features(panel);
+	if (rc)
+		DSI_ERR("failed to parse misc features, rc=%d\n", rc);
+
+	rc = dsi_panel_parse_hdr_config(panel);
+	if (rc)
+		DSI_ERR("failed to parse hdr config, rc=%d\n", rc);
+
+	rc = dsi_panel_get_mode_count(panel);
+	if (rc) {
+		DSI_ERR("failed to get mode count, rc=%d\n", rc);
+		goto error;
+	}
+
+	rc = dsi_panel_parse_dms_info(panel);
+	if (rc)
+		DSI_DEBUG("failed to get dms info, rc=%d\n", rc);
+
+	rc = dsi_panel_parse_esd_config(panel);
+	if (rc)
+		DSI_DEBUG("failed to parse esd config, rc=%d\n", rc);
+
+	rc = dsi_panel_vreg_get(panel);
+	if (rc) {
+		DSI_ERR("[%s] failed to get panel regulators, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+
+	panel->power_mode = SDE_MODE_DPMS_OFF;
+	drm_panel_init(&panel->drm_panel);
+	panel->drm_panel.dev = &panel->mipi_device.dev;
+	panel->mipi_device.dev.of_node = of_node;
+
+	rc = drm_panel_add(&panel->drm_panel);
+	if (rc)
+		goto error_vreg_put;
+
+	mutex_init(&panel->panel_lock);
+
+	return panel;
+error_vreg_put:
+	(void)dsi_panel_vreg_put(panel);
+error:
+	kfree(panel);
+	return ERR_PTR(rc);
+}
+
+void dsi_panel_put(struct dsi_panel *panel)
+{
+	drm_panel_remove(&panel->drm_panel);
+
+	/* free resources allocated for ESD check */
+	dsi_panel_esd_config_deinit(&panel->esd_config);
+
+	kfree(panel);
+}
+
+int dsi_panel_drv_init(struct dsi_panel *panel,
+		       struct mipi_dsi_host *host)
+{
+	int rc = 0;
+	struct mipi_dsi_device *dev;
+
+	if (!panel || !host) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	dev = &panel->mipi_device;
+
+	dev->host = host;
+	/*
+	 * We dont have device structure since panel is not a device node.
+	 * When using drm panel framework, the device is probed when the host is
+	 * create.
+	 */
+	dev->channel = 0;
+	dev->lanes = 4;
+
+	panel->host = host;
+
+	rc = panel->panel_ops.pinctrl_init(panel);
+	if (rc) {
+		DSI_ERR("[%s] failed to init pinctrl, rc=%d\n",
+				panel->name, rc);
+		goto exit;
+	}
+
+	rc = panel->panel_ops.gpio_request(panel);
+	if (rc) {
+		DSI_ERR("[%s] failed to request gpios, rc=%d\n", panel->name,
+		       rc);
+		goto error_pinctrl_deinit;
+	}
+
+	rc = panel->panel_ops.bl_register(panel);
+	if (rc) {
+		if (rc != -EPROBE_DEFER)
+			DSI_ERR("[%s] failed to register backlight, rc=%d\n",
+			       panel->name, rc);
+		goto error_gpio_release;
+	}
+
+	goto exit;
+
+error_gpio_release:
+	(void)dsi_panel_gpio_release(panel);
+error_pinctrl_deinit:
+	(void)dsi_panel_pinctrl_deinit(panel);
+exit:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_drv_deinit(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = panel->panel_ops.bl_unregister(panel);
+	if (rc)
+		DSI_ERR("[%s] failed to unregister backlight, rc=%d\n",
+		       panel->name, rc);
+
+	rc = panel->panel_ops.gpio_release(panel);
+	if (rc)
+		DSI_ERR("[%s] failed to release gpios, rc=%d\n", panel->name,
+		       rc);
+
+	rc = panel->panel_ops.pinctrl_deinit(panel);
+	if (rc)
+		DSI_ERR("[%s] failed to deinit gpios, rc=%d\n", panel->name,
+		       rc);
+
+	rc = dsi_panel_vreg_put(panel);
+	if (rc)
+		DSI_ERR("[%s] failed to put regs, rc=%d\n", panel->name, rc);
+
+	panel->host = NULL;
+	memset(&panel->mipi_device, 0x0, sizeof(panel->mipi_device));
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_validate_mode(struct dsi_panel *panel,
+			    struct dsi_display_mode *mode)
+{
+	return 0;
+}
+
+static int dsi_panel_get_max_res_count(struct dsi_parser_utils *utils,
+	struct device_node *node, u32 *dsc_count, u32 *lm_count)
+{
+	const char *compression;
+	u32 *array = NULL, top_count, len, i;
+	int rc = -EINVAL;
+	bool dsc_enable = false;
+
+	*dsc_count = 0;
+	*lm_count = 0;
+	compression = utils->get_property(node, "qcom,compression-mode", NULL);
+	if (compression && !strcmp(compression, "dsc"))
+		dsc_enable = true;
+
+	len = utils->count_u32_elems(node, "qcom,display-topology");
+	if (len <= 0 || len % TOPOLOGY_SET_LEN ||
+			len > (TOPOLOGY_SET_LEN * MAX_TOPOLOGY))
+		return rc;
+
+	top_count = len / TOPOLOGY_SET_LEN;
+
+	array = kcalloc(len, sizeof(u32), GFP_KERNEL);
+	if (!array)
+		return -ENOMEM;
+
+	rc = utils->read_u32_array(node, "qcom,display-topology", array, len);
+	if (rc) {
+		DSI_ERR("unable to read the display topologies, rc = %d\n", rc);
+		goto read_fail;
+	}
+
+	for (i = 0; i < top_count; i++) {
+		*lm_count = max(*lm_count, array[i * TOPOLOGY_SET_LEN]);
+		if (dsc_enable)
+			*dsc_count = max(*dsc_count,
+					array[i * TOPOLOGY_SET_LEN + 1]);
+	}
+
+read_fail:
+	kfree(array);
+	return 0;
+}
+
+int dsi_panel_get_mode_count(struct dsi_panel *panel)
+{
+	const u32 SINGLE_MODE_SUPPORT = 1;
+	struct dsi_parser_utils *utils;
+	struct device_node *timings_np, *child_np;
+	int num_dfps_rates, num_bit_clks;
+	int num_video_modes = 0, num_cmd_modes = 0;
+	int count, rc = 0;
+	u32 dsc_count = 0, lm_count = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	utils = &panel->utils;
+
+	panel->num_timing_nodes = 0;
+
+	timings_np = utils->get_child_by_name(utils->data,
+			"qcom,mdss-dsi-display-timings");
+	if (!timings_np && !panel->host_config.ext_bridge_mode) {
+		DSI_ERR("no display timing nodes defined\n");
+		rc = -EINVAL;
+		goto error;
+	}
+
+	count = utils->get_child_count(timings_np);
+	if ((!count && !panel->host_config.ext_bridge_mode) ||
+		count > DSI_MODE_MAX) {
+		DSI_ERR("invalid count of timing nodes: %d\n", count);
+		rc = -EINVAL;
+		goto error;
+	}
+
+	/* No multiresolution support is available for video mode panels.
+	 * Multi-mode is supported for video mode during POMS is enabled.
+	 */
+	if (panel->panel_mode != DSI_OP_CMD_MODE &&
+		!panel->host_config.ext_bridge_mode &&
+		!panel->panel_mode_switch_enabled)
+		count = SINGLE_MODE_SUPPORT;
+
+	panel->num_timing_nodes = count;
+	dsi_for_each_child_node(timings_np, child_np) {
+		if (utils->read_bool(child_np, "qcom,mdss-dsi-video-mode"))
+			num_video_modes++;
+		else if (utils->read_bool(child_np,
+					"qcom,mdss-dsi-cmd-mode"))
+			num_cmd_modes++;
+		else if (panel->panel_mode == DSI_OP_VIDEO_MODE)
+			num_video_modes++;
+		else if (panel->panel_mode == DSI_OP_CMD_MODE)
+			num_cmd_modes++;
+
+		dsi_panel_get_max_res_count(utils, child_np,
+				&dsc_count, &lm_count);
+		panel->dsc_count = max(dsc_count, panel->dsc_count);
+		panel->lm_count = max(lm_count, panel->lm_count);
+	}
+
+	num_dfps_rates = !panel->dfps_caps.dfps_support ? 1 :
+					panel->dfps_caps.dfps_list_len;
+
+	num_bit_clks = !panel->dyn_clk_caps.dyn_clk_support ? 1 :
+					panel->dyn_clk_caps.bit_clk_list_len;
+
+	/*
+	 * Inflate num_of_modes by fps and bit clks in dfps.
+	 * Single command mode for video mode panels supporting
+	 * panel operating mode switch.
+	 */
+	num_video_modes = num_video_modes * num_bit_clks * num_dfps_rates;
+
+	if ((panel->panel_mode == DSI_OP_VIDEO_MODE) &&
+			(panel->panel_mode_switch_enabled))
+		num_cmd_modes  = 1;
+	else
+		num_cmd_modes = num_cmd_modes * num_bit_clks;
+
+	panel->num_display_modes = num_video_modes + num_cmd_modes;
+
+error:
+	return rc;
+}
+
+int dsi_panel_get_phy_props(struct dsi_panel *panel,
+			    struct dsi_panel_phy_props *phy_props)
+{
+	int rc = 0;
+
+	if (!panel || !phy_props) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	memcpy(phy_props, &panel->phy_props, sizeof(*phy_props));
+	return rc;
+}
+
+int dsi_panel_get_dfps_caps(struct dsi_panel *panel,
+			    struct dsi_dfps_capabilities *dfps_caps)
+{
+	int rc = 0;
+
+	if (!panel || !dfps_caps) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	memcpy(dfps_caps, &panel->dfps_caps, sizeof(*dfps_caps));
+	return rc;
+}
+
+void dsi_panel_put_mode(struct dsi_display_mode *mode)
+{
+	int i;
+
+	if (!mode->priv_info)
+		return;
+
+	for (i = 0; i < DSI_CMD_SET_MAX; i++) {
+		dsi_panel_destroy_cmd_packets(&mode->priv_info->cmd_sets[i]);
+		dsi_panel_dealloc_cmd_packets(&mode->priv_info->cmd_sets[i]);
+	}
+
+	kfree(mode->priv_info);
+}
+
+void dsi_panel_calc_dsi_transfer_time(struct dsi_host_common_cfg *config,
+		struct dsi_display_mode *mode, u32 frame_threshold_us)
+{
+	u32 frame_time_us, nslices;
+	u64 min_bitclk_hz, total_active_pixels, bits_per_line, pclk_rate_hz,
+		dsi_transfer_time_us, pixel_clk_khz;
+	struct msm_display_dsc_info *dsc = mode->timing.dsc;
+	struct dsi_mode_info *timing = &mode->timing;
+	struct dsi_display_mode *display_mode;
+	u32 jitter_numer, jitter_denom, prefill_lines;
+	u32 min_threshold_us, prefill_time_us, max_transfer_us;
+	u16 bpp;
+
+	/* Packet overlead in bits,2 bytes header + 2 bytes checksum
+	 * + 1 byte dcs data command.
+	*/
+	const u32 packet_overhead = 56;
+
+	display_mode = container_of(timing, struct dsi_display_mode, timing);
+
+	jitter_numer = display_mode->priv_info->panel_jitter_numer;
+	jitter_denom = display_mode->priv_info->panel_jitter_denom;
+
+	frame_time_us = mult_frac(1000, 1000, (timing->refresh_rate));
+
+	if (timing->refresh_rate >= 120)
+		frame_threshold_us = HIGH_REFRESH_RATE_THRESHOLD_TIME_US;
+
+	if (timing->dsc_enabled) {
+		nslices = (timing->h_active)/(dsc->config.slice_width);
+		/* (slice width x bit-per-pixel + packet overhead) x
+		 * number of slices x height x fps / lane
+		 */
+		bpp = DSC_BPP(dsc->config);
+		bits_per_line = ((dsc->config.slice_width * bpp) +
+				packet_overhead) * nslices;
+		bits_per_line = bits_per_line / (config->num_data_lanes);
+
+		min_bitclk_hz = (bits_per_line * timing->v_active *
+					timing->refresh_rate);
+	} else {
+		total_active_pixels = ((dsi_h_active_dce(timing)
+					* timing->v_active));
+		/* calculate the actual bitclk needed to transfer the frame */
+		min_bitclk_hz = (total_active_pixels * (timing->refresh_rate) *
+				(config->bpp));
+		do_div(min_bitclk_hz, config->num_data_lanes);
+	}
+
+	timing->min_dsi_clk_hz = min_bitclk_hz;
+
+	min_threshold_us = mult_frac(frame_time_us,
+			jitter_numer, (jitter_denom * 100));
+	/*
+	 * Increase the prefill_lines proportionately as recommended
+	 * 35lines for 60fps, 52 for 90fps, 70lines for 120fps.
+	 */
+	prefill_lines = mult_frac(MIN_PREFILL_LINES,
+			timing->refresh_rate, 60);
+
+	prefill_time_us = mult_frac(frame_time_us, prefill_lines,
+			(timing->v_active));
+
+	/*
+	 * Threshold is sum of panel jitter time, prefill line time
+	 * plus 64usec buffer time.
+	 */
+	min_threshold_us = min_threshold_us + 64 + prefill_time_us;
+
+	DSI_DEBUG("min threshold time=%d\n", min_threshold_us);
+
+	if (timing->clk_rate_hz) {
+		/* adjust the transfer time proportionately for bit clk*/
+		dsi_transfer_time_us = frame_time_us * min_bitclk_hz;
+		do_div(dsi_transfer_time_us, timing->clk_rate_hz);
+		timing->dsi_transfer_time_us = dsi_transfer_time_us;
+
+	} else if (mode->priv_info->mdp_transfer_time_us) {
+		max_transfer_us = frame_time_us - min_threshold_us;
+		mode->priv_info->mdp_transfer_time_us = min(
+				mode->priv_info->mdp_transfer_time_us,
+				max_transfer_us);
+		timing->dsi_transfer_time_us =
+			mode->priv_info->mdp_transfer_time_us;
+	} else {
+		if (min_threshold_us > frame_threshold_us)
+			frame_threshold_us = min_threshold_us;
+
+		timing->dsi_transfer_time_us = frame_time_us -
+			frame_threshold_us;
+	}
+
+	timing->mdp_transfer_time_us = timing->dsi_transfer_time_us;
+
+	/* Force update mdp xfer time to hal,if clk and mdp xfer time is set */
+	if (mode->priv_info->mdp_transfer_time_us && timing->clk_rate_hz) {
+		timing->mdp_transfer_time_us =
+			mode->priv_info->mdp_transfer_time_us;
+	}
+
+	/* Calculate pclk_khz to update modeinfo */
+	pclk_rate_hz =  min_bitclk_hz * frame_time_us;
+	do_div(pclk_rate_hz, timing->dsi_transfer_time_us);
+
+	pixel_clk_khz = pclk_rate_hz * config->num_data_lanes;
+	do_div(pixel_clk_khz, config->bpp);
+	display_mode->pixel_clk_khz = pixel_clk_khz;
+
+	display_mode->pixel_clk_khz =  display_mode->pixel_clk_khz / 1000;
+}
+
+
+int dsi_panel_get_mode(struct dsi_panel *panel,
+			u32 index, struct dsi_display_mode *mode,
+			int topology_override)
+{
+	struct device_node *timings_np, *child_np;
+	struct dsi_parser_utils *utils;
+	struct dsi_display_mode_priv_info *prv_info;
+	u32 child_idx = 0;
+	int rc = 0, num_timings;
+	int traffic_mode;
+	int panel_mode;
+	void *utils_data = NULL;
+
+	if (!panel || !mode) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+	utils = &panel->utils;
+
+	mode->priv_info = kzalloc(sizeof(*mode->priv_info), GFP_KERNEL);
+	if (!mode->priv_info) {
+		rc = -ENOMEM;
+		goto done;
+	}
+
+	prv_info = mode->priv_info;
+
+	timings_np = utils->get_child_by_name(utils->data,
+		"qcom,mdss-dsi-display-timings");
+	if (!timings_np) {
+		DSI_ERR("no display timing nodes defined\n");
+		rc = -EINVAL;
+		goto parse_fail;
+	}
+
+	num_timings = utils->get_child_count(timings_np);
+	if (!num_timings || num_timings > DSI_MODE_MAX) {
+		DSI_ERR("invalid count of timing nodes: %d\n", num_timings);
+		rc = -EINVAL;
+		goto parse_fail;
+	}
+
+	utils_data = utils->data;
+	traffic_mode = panel->video_config.traffic_mode;
+	panel_mode = panel->panel_mode;
+
+	dsi_for_each_child_node(timings_np, child_np) {
+		if (index != child_idx++)
+			continue;
+
+		utils->data = child_np;
+
+		rc = dsi_panel_parse_timing(&mode->timing, utils);
+		if (rc) {
+			DSI_ERR("failed to parse panel timing, rc=%d\n", rc);
+			goto parse_fail;
+		}
+
+		rc = dsi_panel_parse_dsc_params(mode, utils);
+		if (rc) {
+			DSI_ERR("failed to parse dsc params, rc=%d\n", rc);
+			goto parse_fail;
+		}
+
+		rc = dsi_panel_parse_vdc_params(mode, utils, traffic_mode,
+			panel_mode);
+		if (rc) {
+			DSI_ERR("failed to parse vdc params, rc=%d\n", rc);
+			goto parse_fail;
+		}
+
+		rc = dsi_panel_parse_topology(prv_info, utils,
+				topology_override);
+		if (rc) {
+			DSI_ERR("failed to parse panel topology, rc=%d\n", rc);
+			goto parse_fail;
+		}
+
+		rc = dsi_panel_parse_cmd_sets(prv_info, utils);
+		if (rc) {
+			DSI_ERR("failed to parse command sets, rc=%d\n", rc);
+			goto parse_fail;
+		}
+
+		rc = dsi_panel_parse_jitter_config(mode, utils);
+		if (rc)
+			DSI_ERR(
+			"failed to parse panel jitter config, rc=%d\n", rc);
+
+		rc = dsi_panel_parse_phy_timing(mode, utils);
+		if (rc) {
+			DSI_ERR(
+			"failed to parse panel phy timings, rc=%d\n", rc);
+			goto parse_fail;
+		}
+
+		rc = dsi_panel_parse_partial_update_caps(mode, utils);
+		if (rc)
+			DSI_ERR("failed to partial update caps, rc=%d\n", rc);
+
+		if (panel->panel_mode_switch_enabled) {
+			rc = dsi_panel_parse_panel_mode_caps(mode, utils);
+			if (rc) {
+				rc = 0;
+				mode->panel_mode = panel->panel_mode;
+				DSI_INFO(
+				"POMS: panel mode isn't specified in timing[%d]\n",
+				child_idx);
+			}
+		} else {
+			mode->panel_mode = panel->panel_mode;
+		}
+	}
+	goto done;
+
+parse_fail:
+	kfree(mode->priv_info);
+	mode->priv_info = NULL;
+done:
+	utils->data = utils_data;
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_get_host_cfg_for_mode(struct dsi_panel *panel,
+				    struct dsi_display_mode *mode,
+				    struct dsi_host_config *config)
+{
+	int rc = 0;
+	struct dsi_dyn_clk_caps *dyn_clk_caps = &panel->dyn_clk_caps;
+
+	if (!panel || !mode || !config) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	config->panel_mode = panel->panel_mode;
+	memcpy(&config->common_config, &panel->host_config,
+	       sizeof(config->common_config));
+
+	if (panel->panel_mode == DSI_OP_VIDEO_MODE) {
+		memcpy(&config->u.video_engine, &panel->video_config,
+		       sizeof(config->u.video_engine));
+	} else {
+		memcpy(&config->u.cmd_engine, &panel->cmd_config,
+		       sizeof(config->u.cmd_engine));
+	}
+
+	memcpy(&config->video_timing, &mode->timing,
+	       sizeof(config->video_timing));
+	config->video_timing.mdp_transfer_time_us =
+			mode->priv_info->mdp_transfer_time_us;
+	config->video_timing.dsc_enabled = mode->priv_info->dsc_enabled;
+	config->video_timing.dsc = &mode->priv_info->dsc;
+
+	config->video_timing.vdc_enabled = mode->priv_info->vdc_enabled;
+	config->video_timing.vdc = &mode->priv_info->vdc;
+
+	if (dyn_clk_caps->dyn_clk_support)
+		config->bit_clk_rate_hz_override = mode->timing.clk_rate_hz;
+	else
+		config->bit_clk_rate_hz_override = mode->priv_info->clk_rate_hz;
+
+	config->esc_clk_rate_hz = 19200000;
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_pre_prepare(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	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;
+	}
+
+error:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_update_pps(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_panel_cmd_set *set = NULL;
+	struct dsi_display_mode_priv_info *priv_info = NULL;
+
+	if (!panel || !panel->cur_mode) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	priv_info = panel->cur_mode->priv_info;
+
+	set = &priv_info->cmd_sets[DSI_CMD_SET_PPS];
+
+	if (priv_info->dsc_enabled)
+		dsi_dsc_create_pps_buf_cmd(&priv_info->dsc,
+				panel->dce_pps_cmd, 0,
+				DSI_CMD_PPS_SIZE - DSI_CMD_PPS_HDR_SIZE);
+	else if (priv_info->vdc_enabled)
+		dsi_vdc_create_pps_buf_cmd(&priv_info->vdc,
+				panel->dce_pps_cmd, 0,
+				DSI_CMD_PPS_SIZE - DSI_CMD_PPS_HDR_SIZE);
+
+	if (priv_info->dsc_enabled || priv_info->vdc_enabled) {
+		rc = dsi_panel_create_cmd_packets(panel->dce_pps_cmd,
+				DSI_CMD_PPS_SIZE, 1, set->cmds);
+		if (rc) {
+			DSI_ERR("failed to create cmd packets, rc=%d\n", rc);
+			goto error;
+		}
+	}
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_PPS);
+	if (rc) {
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_PPS cmds, rc=%d\n",
+			panel->name, rc);
+	}
+
+	dsi_panel_destroy_cmd_packets(set);
+error:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_set_lp1(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+	if (!panel->panel_initialized)
+		goto exit;
+
+	/*
+	 * Consider LP1->LP2->LP1.
+	 * If the panel is already in LP mode, do not need to
+	 * set the regulator.
+	 * IBB and AB power mode would be set at the same time
+	 * in PMIC driver, so we only call ibb setting that is enough.
+	 */
+	if (dsi_panel_is_type_oled(panel) &&
+		panel->power_mode != SDE_MODE_DPMS_LP2)
+		dsi_pwr_panel_regulator_mode_set(&panel->power_info,
+			"ibb", REGULATOR_MODE_IDLE);
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_LP1);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_LP1 cmd, rc=%d\n",
+		       panel->name, rc);
+exit:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_set_lp2(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+	if (!panel->panel_initialized)
+		goto exit;
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_LP2);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_LP2 cmd, rc=%d\n",
+		       panel->name, rc);
+exit:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_set_nolp(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+	if (!panel->panel_initialized)
+		goto exit;
+
+	/*
+	 * Consider about LP1->LP2->NOLP.
+	 */
+	if (dsi_panel_is_type_oled(panel) &&
+	    (panel->power_mode == SDE_MODE_DPMS_LP1 ||
+	     panel->power_mode == SDE_MODE_DPMS_LP2))
+		dsi_pwr_panel_regulator_mode_set(&panel->power_info,
+			"ibb", REGULATOR_MODE_NORMAL);
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_NOLP);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_NOLP cmd, rc=%d\n",
+		       panel->name, rc);
+exit:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_prepare(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	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;
+		}
+	}
+
+	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;
+	}
+
+error:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+static int dsi_panel_roi_prepare_dcs_cmds(struct dsi_panel_cmd_set *set,
+		struct dsi_rect *roi, int ctrl_idx, int unicast)
+{
+	static const int ROI_CMD_LEN = 5;
+
+	int rc = 0;
+
+	/* DTYPE_DCS_LWRITE */
+	char *caset, *paset;
+
+	set->cmds = NULL;
+
+	caset = kzalloc(ROI_CMD_LEN, GFP_KERNEL);
+	if (!caset) {
+		rc = -ENOMEM;
+		goto exit;
+	}
+	caset[0] = 0x2a;
+	caset[1] = (roi->x & 0xFF00) >> 8;
+	caset[2] = roi->x & 0xFF;
+	caset[3] = ((roi->x - 1 + roi->w) & 0xFF00) >> 8;
+	caset[4] = (roi->x - 1 + roi->w) & 0xFF;
+
+	paset = kzalloc(ROI_CMD_LEN, GFP_KERNEL);
+	if (!paset) {
+		rc = -ENOMEM;
+		goto error_free_mem;
+	}
+	paset[0] = 0x2b;
+	paset[1] = (roi->y & 0xFF00) >> 8;
+	paset[2] = roi->y & 0xFF;
+	paset[3] = ((roi->y - 1 + roi->h) & 0xFF00) >> 8;
+	paset[4] = (roi->y - 1 + roi->h) & 0xFF;
+
+	set->type = DSI_CMD_SET_ROI;
+	set->state = DSI_CMD_SET_STATE_LP;
+	set->count = 2; /* send caset + paset together */
+	set->cmds = kcalloc(set->count, sizeof(*set->cmds), GFP_KERNEL);
+	if (!set->cmds) {
+		rc = -ENOMEM;
+		goto error_free_mem;
+	}
+	set->cmds[0].msg.channel = 0;
+	set->cmds[0].msg.type = MIPI_DSI_DCS_LONG_WRITE;
+	set->cmds[0].msg.flags = unicast ? MIPI_DSI_MSG_UNICAST : 0;
+	set->cmds[0].msg.ctrl = unicast ? ctrl_idx : 0;
+	set->cmds[0].msg.tx_len = ROI_CMD_LEN;
+	set->cmds[0].msg.tx_buf = caset;
+	set->cmds[0].msg.rx_len = 0;
+	set->cmds[0].msg.rx_buf = 0;
+	set->cmds[0].msg.wait_ms = 0;
+	set->cmds[0].last_command = 0;
+	set->cmds[0].post_wait_ms = 0;
+
+	set->cmds[1].msg.channel = 0;
+	set->cmds[1].msg.type = MIPI_DSI_DCS_LONG_WRITE;
+	set->cmds[1].msg.flags = unicast ? MIPI_DSI_MSG_UNICAST : 0;
+	set->cmds[1].msg.ctrl = unicast ? ctrl_idx : 0;
+	set->cmds[1].msg.tx_len = ROI_CMD_LEN;
+	set->cmds[1].msg.tx_buf = paset;
+	set->cmds[1].msg.rx_len = 0;
+	set->cmds[1].msg.rx_buf = 0;
+	set->cmds[1].msg.wait_ms = 0;
+	set->cmds[1].last_command = 1;
+	set->cmds[1].post_wait_ms = 0;
+
+	goto exit;
+
+error_free_mem:
+	kfree(caset);
+	kfree(paset);
+	kfree(set->cmds);
+
+exit:
+	return rc;
+}
+
+int dsi_panel_send_qsync_on_dcs(struct dsi_panel *panel,
+		int ctrl_idx)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	DSI_DEBUG("ctrl:%d qsync on\n", ctrl_idx);
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_QSYNC_ON);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_QSYNC_ON cmds rc=%d\n",
+		       panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_send_qsync_off_dcs(struct dsi_panel *panel,
+		int ctrl_idx)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	DSI_DEBUG("ctrl:%d qsync off\n", ctrl_idx);
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_QSYNC_OFF);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_QSYNC_OFF cmds rc=%d\n",
+		       panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_send_roi_dcs(struct dsi_panel *panel, int ctrl_idx,
+		struct dsi_rect *roi)
+{
+	int rc = 0;
+	struct dsi_panel_cmd_set *set;
+	struct dsi_display_mode_priv_info *priv_info;
+
+	if (!panel || !panel->cur_mode) {
+		DSI_ERR("Invalid params\n");
+		return -EINVAL;
+	}
+
+	priv_info = panel->cur_mode->priv_info;
+	set = &priv_info->cmd_sets[DSI_CMD_SET_ROI];
+
+	rc = dsi_panel_roi_prepare_dcs_cmds(set, roi, ctrl_idx, true);
+	if (rc) {
+		DSI_ERR("[%s] failed to prepare DSI_CMD_SET_ROI cmds, rc=%d\n",
+				panel->name, rc);
+		return rc;
+	}
+	DSI_DEBUG("[%s] send roi x %d y %d w %d h %d\n", panel->name,
+			roi->x, roi->y, roi->w, roi->h);
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_ROI);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_ROI cmds, rc=%d\n",
+				panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+
+	dsi_panel_destroy_cmd_packets(set);
+	dsi_panel_dealloc_cmd_packets(set);
+
+	return rc;
+}
+
+int dsi_panel_pre_mode_switch_to_video(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("Invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_CMD_TO_VID_SWITCH);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_CMD_TO_VID_SWITCH cmds, rc=%d\n",
+		       panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_pre_mode_switch_to_cmd(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("Invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_VID_TO_CMD_SWITCH);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_CMD_TO_VID_SWITCH cmds, rc=%d\n",
+		       panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_mode_switch_to_cmd(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("Invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_VID_TO_CMD_SWITCH);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_CMD_TO_VID_SWITCH cmds, rc=%d\n",
+		       panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_mode_switch_to_vid(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("Invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_CMD_TO_VID_SWITCH);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_CMD_TO_VID_SWITCH cmds, rc=%d\n",
+		       panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_switch(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("Invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_TIMING_SWITCH);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_TIMING_SWITCH cmds, rc=%d\n",
+		       panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_post_switch(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("Invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_TIMING_SWITCH);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_POST_TIMING_SWITCH cmds, rc=%d\n",
+		       panel->name, rc);
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_enable(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("Invalid params\n");
+		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);
+	if (rc)
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_ON cmds, rc=%d\n",
+		       panel->name, rc);
+	else
+		panel->panel_initialized = true;
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_post_enable(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_ON);
+	if (rc) {
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_POST_ON cmds, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+error:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_pre_disable(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	if (gpio_is_valid(panel->bl_config.en_gpio))
+		gpio_set_value(panel->bl_config.en_gpio, 0);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_PRE_OFF);
+	if (rc) {
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_PRE_OFF cmds, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+
+error:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_disable(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		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 */
+	if (!atomic_read(&panel->esd_recovery_pending)) {
+		/*
+		 * Need to set IBB/AB regulator mode to STANDBY,
+		 * if panel is going off from AOD mode.
+		 */
+		if (dsi_panel_is_type_oled(panel) &&
+			(panel->power_mode == SDE_MODE_DPMS_LP1 ||
+			panel->power_mode == SDE_MODE_DPMS_LP2))
+			dsi_pwr_panel_regulator_mode_set(&panel->power_info,
+				"ibb", REGULATOR_MODE_STANDBY);
+		rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_OFF);
+		if (rc) {
+			/*
+			 * Sending panel off commands may fail when  DSI
+			 * controller is in a bad state. These failures can be
+			 * ignored since controller will go for full reset on
+			 * subsequent display enable anyway.
+			 */
+			pr_warn_ratelimited("[%s] failed to send DSI_CMD_SET_OFF cmds, rc=%d\n",
+					panel->name, rc);
+			rc = 0;
+		}
+	}
+	panel->panel_initialized = false;
+	panel->power_mode = SDE_MODE_DPMS_OFF;
+
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_unprepare(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_OFF);
+	if (rc) {
+		DSI_ERR("[%s] failed to send DSI_CMD_SET_POST_OFF cmds, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+
+error:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
+
+int dsi_panel_post_unprepare(struct dsi_panel *panel)
+{
+	int rc = 0;
+
+	if (!panel) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&panel->panel_lock);
+
+	rc = dsi_panel_power_off(panel);
+	if (rc) {
+		DSI_ERR("[%s] panel power_Off failed, rc=%d\n",
+		       panel->name, rc);
+		goto error;
+	}
+error:
+	mutex_unlock(&panel->panel_lock);
+	return rc;
+}
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 2379206924f4..f260ead84026 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -37,6 +37,8 @@
 #define MIPI_DSI_MSG_ASYNC_OVERRIDE BIT(4)
 #define MIPI_DSI_MSG_CMD_DMA_SCHED BIT(5)
 
+#define DSI_PANEL_MAX_PANEL_LEN	256
+
 enum dsi_panel_rotation {
 	DSI_PANEL_ROTATE_NONE = 0,
 	DSI_PANEL_ROTATE_HV_FLIP,
@@ -269,6 +271,9 @@ struct dsi_panel {
 	u32 tlmm_gpio_count;
 
 	struct dsi_panel_ops panel_ops;
+	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 ffaa831b2a4e4c2e674163cca8c0563c76460e8c Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 30 Jul 2019 13:45:53 -0500
Subject: [PATCH 013/116] 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: 767ee61

Change-Id: Iaf7f5da55a839037b0fa1e25ac84faf5df480ae5
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697279
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c |  34 ++++++++++++++
 msm/dsi/dsi_display.h |  14 ++++++
 msm/dsi/dsi_panel.c   | 100 ++++++++++++++++++++++++++++++++++++++++--
 msm/dsi/dsi_panel.h   |   3 ++
 4 files changed, 148 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 5d0767ac4936..c922727ccadc 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -731,6 +731,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 8724178e0541..7502c1ca3380 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -764,6 +764,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 96fbb6e1d525..15ebe5f90559 100644
--- 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"
@@ -3535,6 +3536,74 @@ static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
 		panel->panel_ops.parse_gpios = dsi_panel_parse_gpios;
 		panel->panel_ops.parse_power_cfg = dsi_panel_parse_power_cfg;
 	}
+static int dsi_panel_parse_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,
@@ -3575,6 +3644,10 @@ 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",
@@ -4737,6 +4810,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");
@@ -4747,11 +4821,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 f260ead84026..6d3a163f297f 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -274,6 +274,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 fc4eaf19ee49beb2641da707673707256c513b03 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 08:11:13 -0500
Subject: [PATCH 014/116] 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: 17e936d

Change-Id: I040b35c7ff27d35db15eedcbf94df80e6185da19
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697288
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 15ebe5f90559..6fc1b4e56031 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -18,6 +18,8 @@
 #include "sde_dbg.h"
 #include "sde_dsc_helper.h"
 #include "sde_vdc_helper.h"
+#include "dsi_display.h"
+
 
 /**
  * topology is currently defined by a set of following 3 values:
@@ -3606,6 +3608,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,
@@ -4838,6 +4856,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 f4490c44a2cec00ed77d31b5b74fdc26da38069b Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 08:25:45 -0500
Subject: [PATCH 015/116] 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: c3d7c03

Change-Id: I595027afdbb7934b63d2f41c151277a9c48b5e21
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697290
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@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 6fc1b4e56031..b2c471d4d798 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -4829,6 +4829,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");
@@ -4856,9 +4857,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 047e987980c1ee911570e36f728cbc04efbb676c Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 08:32:50 -0500
Subject: [PATCH 016/116] 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: 890aa1c9

Change-Id: I5ca8fbd5f8aa17233683d82a66fe6ed45e722305
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697292
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 9c7df05e71b3..7e8d5f2a0fdb 100644
--- a/msm/Makefile
+++ b/msm/Makefile
@@ -42,6 +42,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 9f7a815c9227..4f1aa7a6d65d 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -152,6 +152,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 58fb008ae0b19079b11b88250324f742f944d0c6 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 28 Aug 2019 14:02:15 -0500
Subject: [PATCH 017/116] 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: 890aa1c9

Change-Id: I4ebba9f87dadcc3e9c22ddb58b4412c7124d7895
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697321
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c   | 269 +++++++++++++++++++++++++++++++++++-----
 msm/dsi/dsi_display.h   |  13 ++
 msm/sde/sde_connector.h |  13 ++
 msm/sde/sde_kms.c       |   6 +
 msm/sde/sde_motUtil.c   |  31 ++++-
 msm/sde/sde_motUtil.h   |  25 ++++
 6 files changed, 325 insertions(+), 32 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index c922727ccadc..17dde72d5b7c 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -976,6 +976,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)
 {
@@ -1173,47 +1333,92 @@ static void _dsi_display_continuous_clk_ctrl(struct dsi_display *display,
 }
 
 int dsi_display_cmd_receive(void *display, const char *cmd_buf,
-		u32 cmd_buf_len,  u8 *recv_buf, u32 recv_buf_len)
+                u32 cmd_buf_len,  u8 *recv_buf, u32 recv_buf_len)
 {
-	struct dsi_display *dsi_display = display;
-	struct dsi_cmd_desc cmd = {};
-	u8 cmd_payload[MAX_CMD_PAYLOAD_SIZE] = {0};
-	bool state = false;
-	int rc = -1;
+        struct dsi_display *dsi_display = display;
+        struct dsi_cmd_desc cmd = {};
+        u8 cmd_payload[MAX_CMD_PAYLOAD_SIZE] = {0};
+        bool state = false;
+        int rc = -1;
 
-	if (!dsi_display || !cmd_buf || !recv_buf) {
-		DSI_ERR("[DSI] invalid params\n");
-		return -EINVAL;
-	}
+        if (!dsi_display || !cmd_buf || !recv_buf) {
+                DSI_ERR("[DSI] invalid params\n");
+                return -EINVAL;
+        }
 
 	SDE_EVT32(cmd_buf_len, recv_buf_len);
 
-	rc = dsi_display_cmd_prepare(cmd_buf, cmd_buf_len,
-			&cmd, cmd_payload, MAX_CMD_PAYLOAD_SIZE);
-	if (rc) {
-		DSI_ERR("[DSI] command prepare failed, rc = %d\n", rc);
-		return rc;
-	}
+        rc = dsi_display_cmd_prepare(cmd_buf, cmd_buf_len,
+                        &cmd, cmd_payload, MAX_CMD_PAYLOAD_SIZE);
+        if (rc) {
+                DSI_ERR("[DSI] command prepare failed, rc = %d\n", rc);
+                return rc;
+        }
 
-	cmd.msg.rx_buf = recv_buf;
-	cmd.msg.rx_len = recv_buf_len;
+        cmd.msg.rx_buf = recv_buf;
+        cmd.msg.rx_len = recv_buf_len;
 
-	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;
-	}
+        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 = dsi_display_cmd_rx(dsi_display, &cmd);
-	if (rc <= 0)
-		DSI_ERR("[DSI] Display command receive failed, rc=%d\n", rc);
+        rc = dsi_display_cmd_rx(dsi_display, &cmd);
+        if (rc <= 0)
+                DSI_ERR("[DSI] Display command receive failed, rc=%d\n", rc);
 
 end:
-	mutex_unlock(&dsi_display->display_lock);
-	return rc;
+        mutex_unlock(&dsi_display->display_lock);
+        return rc;
+}
+
+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)
@@ -3430,6 +3635,8 @@ static ssize_t dsi_host_transfer(struct mipi_dsi_host *host,
 				(display->enabled))
 			cmd_flags |= DSI_CTRL_CMD_CUSTOM_DMA_SCHED;
 
+		if (msg->rx_buf)
+			cmd_flags |= DSI_CTRL_CMD_READ;
 		rc = dsi_ctrl_cmd_transfer(display->ctrl[ctrl_idx].ctrl, msg,
 				&cmd_flags);
 		if (rc < 0) {
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index 7502c1ca3380..6565f59713a7 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -20,6 +20,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
@@ -701,6 +703,17 @@ int dsi_display_cmd_transfer(struct drm_connector *connector,
  */
 int dsi_display_cmd_receive(void *display, const char *cmd_buf,
 			    u32 cmd_buf_len, u8 *recv_buf, u32 recv_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
diff --git a/msm/sde/sde_connector.h b/msm/sde/sde_connector.h
index ecbbefbf8b60..95054d4025f0 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
@@ -277,6 +278,18 @@ struct sde_connector_ops {
 	int (*cmd_receive)(void *display, const char *cmd_buf,
 			   u32 cmd_buf_len, u8 *recv_buf, u32 recv_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 4f1aa7a6d65d..d65e0751bc79 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -30,6 +30,9 @@
 #include <linux/suspend.h>
 #include <drm/drm_atomic_uapi.h>
 #include <drm/drm_probe_helper.h>
+#include <linux/memblock.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "msm_drv.h"
 #include "msm_mmu.h"
@@ -60,6 +63,8 @@
 #include <linux/qtee_shmbridge.h>
 #include <linux/haven/hh_irq_lend.h>
 
+#include "sde_motUtil.h"
+
 #define CREATE_TRACE_POINTS
 #include "sde_trace.h"
 
@@ -1745,6 +1750,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,
 		.cont_splash_res_disable = dsi_display_cont_splash_res_disable,
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 0263204e97df2d2f5d422f50bf4d92d98455f7fc Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 09:46:07 -0500
Subject: [PATCH 018/116] disp: msm: Provide a dynamic method to disable the
 ESD.

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

Port from: 3c35c27

Change-Id: I95a9861855dc0babfd69c392111b713ed7c89c0e
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697323
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 17dde72d5b7c..2c917ddcb7e4 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -946,6 +946,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 6565f59713a7..c0efbbecf9ae 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -715,6 +715,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 404e8af8c80f..8ca87e51d4de 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -557,8 +557,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 95054d4025f0..1453dde9c872 100644
--- a/msm/sde/sde_connector.h
+++ b/msm/sde/sde_connector.h
@@ -290,6 +290,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 d65e0751bc79..35ab0258b2bb 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -1752,6 +1752,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,
 		.cont_splash_res_disable = dsi_display_cont_splash_res_disable,
 		.get_panel_vfp = dsi_display_get_panel_vfp,
@@ -1775,6 +1776,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,
 		.cont_splash_res_disable = NULL,
 		.get_panel_vfp = NULL,
@@ -1795,6 +1797,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,
 		.cont_splash_res_disable = NULL,
 		.get_panel_vfp = NULL,

From fd18f11883426a2b1003112fcef7b89604458537 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 12:58:34 -0500
Subject: [PATCH 019/116] 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: de5326b

Change-Id: I42b8f1319786f21f79b2958f284351ff0ef3ae5f
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697380
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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     |  28 +++++++
 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, 327 insertions(+)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 892334fc1315..d6223918385c 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -262,6 +262,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 {
@@ -288,6 +290,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 2c917ddcb7e4..d3c7073ebdaa 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -259,6 +259,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 c0efbbecf9ae..b4edfbcad47f 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -598,6 +598,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 b2c471d4d798..01f77d0189e4 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -42,6 +42,15 @@
 #define DSI_PANEL_UNKNOWN_PANEL_NAME	"unknown"
 #define DSI_PANEL_PANEL_DEFAULT_VER 	0xffffffffffffffff
 
+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},
+};
+
 static void dsi_dce_prepare_pps_header(char *buf, u32 pps_delay_ms)
 {
 	char *bp;
@@ -726,6 +735,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;
@@ -1818,6 +1921,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] = {
@@ -1844,6 +1950,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",
 };
 
 int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
@@ -3538,6 +3646,68 @@ static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
 		panel->panel_ops.parse_gpios = dsi_panel_parse_gpios;
 		panel->panel_ops.parse_power_cfg = dsi_panel_parse_power_cfg;
 	}
+static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
+					struct device_node *of_node)
+{
+	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)
 {
@@ -3666,6 +3836,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 6d3a163f297f..e406b76e9c3f 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -38,6 +38,7 @@
 #define MIPI_DSI_MSG_CMD_DMA_SCHED BIT(5)
 
 #define DSI_PANEL_MAX_PANEL_LEN	256
+#define MAX_PARAM_NAME 10
 
 enum dsi_panel_rotation {
 	DSI_PANEL_ROTATE_NONE = 0,
@@ -184,6 +185,27 @@ struct drm_panel_esd_config {
 struct dsi_panel_spr_info {
 	bool enable;
 	enum msm_display_spr_pack_type pack_type;
+
+};
+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_tlmm_gpio {
@@ -277,6 +299,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)
@@ -412,4 +436,8 @@ int dsi_panel_create_cmd_packets(const char *data, u32 length, u32 count,
 void dsi_panel_destroy_cmd_packets(struct dsi_panel_cmd_set *set);
 
 void dsi_panel_dealloc_cmd_packets(struct dsi_panel_cmd_set *set);
+
+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 438c9abbec32..655fa0cafd97 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -215,6 +215,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
 };
@@ -351,6 +353,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
  * @config                   DSC encoder configuration
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index 8ca87e51d4de..615f1d622edb 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -761,6 +761,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)
 {
@@ -1437,6 +1455,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",
@@ -1543,6 +1562,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;
 	}
@@ -2619,6 +2645,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)
@@ -3064,6 +3129,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 1453dde9c872..4c0715c2333d 100644
--- a/msm/sde/sde_connector.h
+++ b/msm/sde/sde_connector.h
@@ -297,6 +297,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 35ab0258b2bb..ededce65fb3e 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -1753,6 +1753,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,
 		.cont_splash_res_disable = dsi_display_cont_splash_res_disable,
 		.get_panel_vfp = dsi_display_get_panel_vfp,
@@ -1777,6 +1778,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,
 		.cont_splash_res_disable = NULL,
 		.get_panel_vfp = NULL,
@@ -1798,6 +1800,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,
 		.cont_splash_res_disable = NULL,
 		.get_panel_vfp = NULL,

From 951f3bea00166cb2418828ce38cf7545b15c94a1 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 20 Aug 2019 14:22:52 -0500
Subject: [PATCH 020/116] 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 2401ffc.

Change-Id: I548224cf21d266f4f4bb2373f8a9fbf041cf84d7
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1412834
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1697401
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
---
 msm/dsi/dsi_panel.c     |  40 +++++++---
 msm/dsi/dsi_panel.h     |   7 +-
 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, 286 insertions(+), 44 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 01f77d0189e4..370611cca455 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -47,8 +47,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},
+	},
 };
 
 static void dsi_dce_prepare_pps_header(char *buf, u32 pps_delay_ms)
@@ -735,7 +738,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;
@@ -770,6 +773,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 |
@@ -3647,7 +3656,7 @@ static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
 		panel->panel_ops.parse_power_cfg = dsi_panel_parse_power_cfg;
 	}
 static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
-					struct device_node *of_node)
+				struct device_node *of_node, u32 param_idx)
 {
 	int i, j, rc =0;
 	struct panel_param *param;
@@ -3658,9 +3667,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,
@@ -3686,15 +3701,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);
@@ -3805,6 +3822,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)
@@ -3836,8 +3854,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 e406b76e9c3f..88f31d24efef 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -185,8 +185,13 @@ struct drm_panel_esd_config {
 struct dsi_panel_spr_info {
 	bool enable;
 	enum msm_display_spr_pack_type pack_type;
-
 };
+
+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 655fa0cafd97..24bb4f6443cc 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -353,6 +353,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 615f1d622edb..48a132bec728 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1567,7 +1567,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;
@@ -2651,7 +2653,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;
@@ -2671,12 +2673,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 89c4956f4ccc517f8989b610810f9e7c1eb7b129 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 20 Aug 2019 15:00:13 -0500
Subject: [PATCH 021/116] 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: b5f053287

Change-Id: I06ec806c9878a9eaa2b1c08b84968102e258bda3
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1412835
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1697406
Reviewed-by: Guobin Zhang <zhanggb@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 d3c7073ebdaa..93b89283e8b2 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8592,6 +8592,59 @@ static void dsi_display_panel_id_notification(struct dsi_display *display)
 	}
 }
 
+/* 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;
@@ -8649,6 +8702,8 @@ int dsi_display_enable(struct dsi_display *display)
 			       display->name, rc);
 			goto error;
 		}
+
+		dsi_display_enable_status(display, true);
 	}
 	dsi_display_panel_id_notification(display);
 	/* Block sending pps command if modeset is due to fps difference */
@@ -8850,6 +8905,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 5cdb58b738083703a7b1f1032fab9c128d5d9010 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 21 Aug 2019 07:45:39 -0500
Subject: [PATCH 022/116] 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 : 75d097728

Change-Id: I8252c0e0865780e0b0dbe5252dc663981fc16ba3
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697408
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 93b89283e8b2..4bc66c905fc2 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -50,6 +50,8 @@ static const struct of_device_id dsi_display_dt_match[] = {
 	{}
 };
 
+static void dsi_display_is_probed(int enable_idx, int probe_status);
+
 bool is_skip_op_required(struct dsi_display *display)
 {
 	if (!display)
@@ -6294,6 +6296,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");
@@ -6332,11 +6335,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;
@@ -6385,6 +6392,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;
@@ -8595,10 +8604,25 @@ static void dsi_display_panel_id_notification(struct dsi_display *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)
 {
@@ -8610,12 +8634,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;
 	}
@@ -8623,16 +8647,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 eef9a42827c38e1b27bfa082645d6a3ccf42cb34 Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Wed, 12 Sep 2018 09:14:56 -0500
Subject: [PATCH 023/116] disp: msm: Add panel name to enable status API

Adding a name to DSI panel enable status API

Port from: f41f8deae

Change-Id: Ibde9b1582454275c7491422b0101c78ba507c7b4
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697410
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 4bc66c905fc2..144c522c3c77 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -50,7 +50,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);
 
 bool is_skip_op_required(struct dsi_display *display)
 {
@@ -6393,7 +6393,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;
@@ -8606,6 +8606,7 @@ struct dsi_enable_status {
 	struct dsi_display *display;
 	int probed;
 	bool enable;
+	char pname[128];
 };
 
 static struct dsi_enable_status enable_status[2] = {
@@ -8617,11 +8618,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)
@@ -8647,7 +8651,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;
@@ -8662,6 +8666,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 15fe7a6142f9ba17a9a07ada2828d4b565f2beb6 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 18 Sep 2018 07:19:25 -0500
Subject: [PATCH 024/116] 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: fbc31d9a7

Change-Id: Idba46c92b950965351de9d951e6067d241090b77
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697469
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 144c522c3c77..3cfbbc326686 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -50,7 +50,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);
 
 bool is_skip_op_required(struct dsi_display *display)
 {
@@ -6107,6 +6109,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) {
@@ -6296,7 +6299,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");
@@ -6335,15 +6337,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;
@@ -6392,8 +6390,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;
@@ -8606,7 +8602,7 @@ 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] = {
@@ -8618,14 +8614,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)
@@ -8651,7 +8656,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;
@@ -8679,7 +8685,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)
 {
@@ -8712,6 +8717,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");
 		dsi_display_panel_id_notification(display);

From 22e8e5a91943571267ec897256785124f6074773 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 22 Aug 2019 08:35:43 -0500
Subject: [PATCH 025/116] 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: 8908f4c

Change-Id: I3e212b48ceb02b52bbb2026d4c37ea8542d9622e
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697472
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c |  8 ++++++++
 msm/dsi/dsi_panel.c   | 35 ++++++++++++++++++++---------------
 msm/dsi/dsi_panel.h   |  5 ++++-
 msm/msm_drv.h         |  8 ++++++++
 4 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 3cfbbc326686..7f706d94b06f 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -4613,6 +4613,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);
@@ -7043,6 +7046,11 @@ int dsi_display_get_info(struct drm_connector *connector,
 		true : false;
 	info->poms_align_vsync = display->panel->poms_align_vsync;
 
+	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 370611cca455..f2657f71be23 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1542,7 +1542,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;
@@ -1557,9 +1557,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,
@@ -1570,13 +1579,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;
 }
@@ -3873,12 +3884,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 88f31d24efef..ec75bbdc1147 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -37,7 +37,7 @@
 #define MIPI_DSI_MSG_ASYNC_OVERRIDE BIT(4)
 #define MIPI_DSI_MSG_CMD_DMA_SCHED BIT(5)
 
-#define DSI_PANEL_MAX_PANEL_LEN	256
+#define DSI_PANEL_MAX_PANEL_LEN        128
 #define MAX_PARAM_NAME 10
 
 enum dsi_panel_rotation {
@@ -299,6 +299,7 @@ struct dsi_panel {
 
 	struct dsi_panel_ops panel_ops;
 	bool esd_utag_enable;
+	u64 panel_id;
 	u64 panel_ver;
 	char panel_name[DSI_PANEL_MAX_PANEL_LEN];
 
@@ -422,6 +423,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);
 
 int dsi_panel_get_io_resources(struct dsi_panel *panel,
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 24bb4f6443cc..7616dd50431f 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -223,6 +223,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
@@ -747,6 +748,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
@@ -776,6 +780,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;
 

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

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

Port from: 6db5516a8

Change-Id: Ib286fbcbb7e1517bd6390d1338d157f371ce680f
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697573
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_defs.h      |  4 ++++
 msm/dsi/dsi_panel.c     | 12 +++++++++++-
 msm/dsi/dsi_panel.h     |  6 ++++++
 msm/msm_drv.h           |  2 ++
 msm/sde/sde_connector.c | 11 +++++++++++
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index d6223918385c..7479bf16a86c 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -264,6 +264,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 {
@@ -292,6 +294,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 f2657f71be23..7285b4028a79 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -47,10 +47,17 @@ static struct panel_param_val_map hbm_map[HBM_STATE_NUM] = {
 	{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}
 	},
 };
 
@@ -1943,7 +1950,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] = {
@@ -1972,6 +1980,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",
 };
 
 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 ec75bbdc1147..12fb317a3241 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -192,6 +192,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 7616dd50431f..5f005fde0060 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -217,6 +217,7 @@ enum msm_mdp_conn_property {
 
 	/* MOT feature panel*/
 	CONNECTOR_PROP_HBM,
+	CONNECTOR_PROP_ACL,
 	/* total # of properties */
 	CONNECTOR_PROP_COUNT
 };
@@ -363,6 +364,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 48a132bec728..b93684011058 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1571,6 +1571,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;
 	}
@@ -2667,6 +2676,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 942f7d4bcfd2f8fcbb7446df482f4efdfb0b469c Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Wed, 31 Jul 2019 13:28:18 -0500
Subject: [PATCH 027/116] disp: msm: dsi: Add print info for DSI_CTRL

Add the DSI_CTRL index to indicate which DSI_CTRL is enable.

Port from: 9a63078

Change-Id: I8af0de72ccc0a4152d53db9efd29255ddfa129e8
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697575
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 7f706d94b06f..596b9f1b2f77 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8168,6 +8168,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");
@@ -8179,7 +8180,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 d17eecb2ac6dd7b7b18ac401fac00fdd2887e8d5 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 27 Aug 2019 09:50:34 -0500
Subject: [PATCH 028/116] disp: msm: dsi: Reducing logging in dsi_panel.c

Reducing unnecessary logging in dsi_panel.c file.

Port from: 7a44c5e

Change-Id: Ib8ffd31ed8d35d322de41b3061441bb46a48c7f3
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697577
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 7285b4028a79..be3f8af9bd07 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -362,7 +362,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",
@@ -771,8 +771,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__,
@@ -799,7 +799,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;
 	}
@@ -814,7 +814,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);
@@ -3193,7 +3193,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,
@@ -3216,7 +3216,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);
@@ -5022,6 +5022,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);
@@ -5044,7 +5045,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);
@@ -5075,7 +5076,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

From 05b1f3803818d199eebd57d6a31949d277669986 Mon Sep 17 00:00:00 2001
From: shuoyan <shuoyan@motorola.com>
Date: Sun, 11 Nov 2018 11:31:13 -0600
Subject: [PATCH 029/116] 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 form 4ec72b4

Change-Id: Ieed101ff0bab707ebf2dabc7e533564bf60cbc90
Signed-off-by: shuoyan <shuoyan@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697582
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 b93684011058..b64ea3d346ac 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1563,8 +1563,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);
@@ -1572,8 +1571,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 1245a50c126e67f38e12ffdccedd78661894357f Mon Sep 17 00:00:00 2001
From: shuoyan <shuoyan@motorola.com>
Date: Fri, 7 Dec 2018 17:06:32 -0600
Subject: [PATCH 030/116] 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 form 9f9c112

Change-Id: I6db8673f88fb9fbc85e98f15af654b03706e586f
Signed-off-by: shuoyan <shuoyan@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697583
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 be3f8af9bd07..58e2f03e4b3e 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -814,7 +814,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);
@@ -834,12 +847,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 ade79873ca909bcda1e31b016436c3646d1982c5 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Tue, 12 Mar 2019 08:18:12 -0500
Subject: [PATCH 031/116] 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 7445d2d.

Change-Id: I8b6d48205ba819f0d36ad7218852241baa33f014
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697588
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/msm_drv.c | 33 +++++++++++++++++++++++++++++++++
 msm/msm_drv.h |  2 ++
 2 files changed, 35 insertions(+)

diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index 5eb8363e2198..2c3e81f7cabf 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -43,6 +43,7 @@
 #include <drm/drm_of.h>
 #include <drm/drm_auth.h>
 #include <drm/drm_probe_helper.h>
+#include <linux/reboot.h>
 
 #include "msm_drv.h"
 #include "msm_gem.h"
@@ -428,6 +429,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);
@@ -755,6 +761,23 @@ static struct msm_kms *_msm_drm_component_init_helper(
 	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_device_init(struct platform_device *pdev,
 		struct drm_driver *drv)
 {
@@ -938,6 +961,16 @@ static int msm_drm_component_init(struct device *dev)
 
 	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 5f005fde0060..cec6d23c6bce 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -38,6 +38,7 @@
 #include <linux/sde_vm_event.h>
 #include <linux/sizes.h>
 #include <linux/kthread.h>
+#include <linux/notifier.h>
 
 #include <drm/drmP.h>
 #include <drm/drm_atomic.h>
@@ -969,6 +970,7 @@ struct msm_drm_private {
 
 	struct mutex vm_client_lock;
 	struct list_head vm_client_list;
+	struct notifier_block msm_drv_notifier;
 };
 
 /* get struct msm_kms * from drm_device * */

From e2e955e81c8791d6d2741cb0ed2cd4beb6546344 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 2 May 2019 15:40:42 -0500
Subject: [PATCH 032/116] 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: f78d13a

Change-Id: Ia5f7f5be683615ec1811f550dec1967335c9816d
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697591
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 596b9f1b2f77..8254aab89600 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8330,7 +8330,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 58e2f03e4b3e..0236ac59252a 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -264,12 +264,13 @@ int dsi_panel_trigger_esd_attack(struct dsi_panel *panel, bool trusted_vm_env)
 	return 0;
 }
 
-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) {
@@ -376,23 +377,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);
 
@@ -4587,14 +4573,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:
@@ -4749,23 +4738,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 12fb317a3241..4be81859ce79 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -386,6 +386,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 3c7f5103437372f5d61ad621b5bbb1b338ffff60 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 29 Aug 2019 13:28:54 -0500
Subject: [PATCH 033/116] 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.

Change-Id: I088af5da728dc758470377253b8d4e16d1222c1b
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697593
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 8254aab89600..89db3afdc289 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -3678,7 +3678,9 @@ static ssize_t dsi_host_transfer(struct mipi_dsi_host *host,
 			cmd_flags |= DSI_CTRL_CMD_READ;
 		rc = dsi_ctrl_cmd_transfer(display->ctrl[ctrl_idx].ctrl, msg,
 				&cmd_flags);
-		if (rc < 0) {
+		if (((cmd_flags & DSI_CTRL_CMD_READ) && rc <= 0) ||
+				(!(cmd_flags & DSI_CTRL_CMD_READ) && rc < 0 )) {
+
 			DSI_ERR("[%s] cmd transfer failed, rc=%d\n",
 			       display->name, rc);
 			goto error_disable_cmd_engine;

From 84265334e2640513865fd6a2a0db8ae5bbf77776 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Tue, 15 Jan 2019 17:34:44 +0800
Subject: [PATCH 034/116] 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: Icc09d39502a9549bfba7cd47efca2993a2716110
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697595
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_defs.h  |  2 ++
 msm/dsi/dsi_panel.c | 16 ++++++++++++++++
 msm/dsi/dsi_panel.h |  5 ++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 7479bf16a86c..3e22080635dc 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -262,6 +262,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
@@ -292,6 +293,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 0236ac59252a..a46e016948cd 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -45,6 +45,7 @@
 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] = {
@@ -755,6 +756,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",
@@ -1952,6 +1957,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",
@@ -1982,6 +1988,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",
@@ -3716,6 +3723,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) {
@@ -3732,6 +3745,9 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 		}
 	}
 
+	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 4be81859ce79..2a2e61bbc2f6 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -201,6 +201,7 @@ enum acl_state {
 enum hbm_state {
 	HBM_OFF_STATE = 0,
 	HBM_ON_STATE,
+	HBM_FOD_ON_STATE,
 	HBM_STATE_NUM
 };
 
@@ -213,7 +214,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;
@@ -312,6 +313,8 @@ struct dsi_panel {
 	u32 disp_on_chk_val;
 	bool no_panel_on_read_support;
 
+	bool panel_hbm_fod;
+
 	struct panel_param *param_cmds;
 };
 

From 5c202c96141e3a22eaaab42e1ccc904880caf6c8 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Wed, 23 Jan 2019 15:03:45 +0800
Subject: [PATCH 035/116] 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: Idf30593736e66386581b729ae28023035cded122
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697597
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 89db3afdc289..1636740cfa2d 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8772,6 +8772,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 a46e016948cd..daed223e3d58 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -854,6 +854,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[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 2a2e61bbc2f6..f391f3795380 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -459,4 +459,6 @@ void dsi_panel_dealloc_cmd_packets(struct dsi_panel_cmd_set *set);
 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 bbf4ba0698875954a7fedb8797a9f8cba4564be1 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Fri, 21 Dec 2018 12:58:04 +0800
Subject: [PATCH 036/116] disp: msm:: disable Elvss dim of HBM for smd panel

Sending the panel_hbm_dim_off command during the panel enable

Port from: a5b269d7

Change-Id: I4f8136152a74fdcbd8cfb4d9f964ed268aa5eb9a
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697599
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_defs.h    |   2 +
 msm/dsi/dsi_display.c | 141 ++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.c   | 162 +++++++++++++++++++++++++++++++++++++++++-
 msm/dsi/dsi_panel.h   |   7 ++
 4 files changed, 311 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 3e22080635dc..870b7c5b5f41 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -267,6 +267,7 @@ 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_HBM_DIM_OFF:		   Turning HBM DIM off
  * @DSI_CMD_SET_MAX
  */
 enum dsi_cmd_set_type {
@@ -298,6 +299,7 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_HBM_OFF,
 	DSI_CMD_SET_ACL_ON,
 	DSI_CMD_SET_ACL_OFF,
+	DSI_CMD_SET_HBM_DIM_OFF,
 	DSI_CMD_SET_MAX
 };
 
diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 1636740cfa2d..f138e668395e 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -1344,6 +1344,144 @@ end:
 	return rc;
 }
 
+static int dsi_display_read_elvss_status(struct dsi_display_ctrl *ctrl,
+		struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct dsi_cmd_desc cmds;
+	u8 data[] = {06, 01, 00, 01, 00, 00, 01, 0xB7};
+	u32 flags = 0;
+	u8 *payload;
+	int size, j;
+	u8 elvss_val;
+	pr_info("++\n");
+
+	if (!panel || !ctrl || !ctrl->ctrl)
+		return -EINVAL;
+
+	DSI_DEBUG("++\n");
+	cmds.msg.type = data[0];
+	cmds.last_command = (data[1] == 1 ? true : false);
+	cmds.msg.channel = data[2];
+	cmds.msg.flags |= (data[3] == 1 ? MIPI_DSI_MSG_REQ_ACK : 0);
+	cmds.msg.ctrl = 0;
+	cmds.post_wait_ms = cmds.msg.wait_ms = data[4];
+	cmds.msg.tx_len = ((data[5] << 8) | (data[6]));
+
+	size = cmds.msg.tx_len * sizeof(u8);
+	payload = kzalloc(size, GFP_KERNEL);
+	if (!payload) {
+		return -ENOMEM;
+	}
+
+	for (j = 0; j < cmds.msg.tx_len; j++)
+		payload[j] = data[7+j];
+
+	cmds.msg.tx_buf = payload;
+	/*
+	 * When DSI controller is not in initialized state, we do not want to
+	 * read reg and hence we defer until next read
+	 * happen.
+	 */
+	/*
+	if (dsi_ctrl_validate_host_state(ctrl->ctrl))
+		return 0;
+	*/
+	flags |= (DSI_CTRL_CMD_FETCH_MEMORY | DSI_CTRL_CMD_READ |
+		  DSI_CTRL_CMD_CUSTOM_DMA_SCHED);
+
+	if (cmds.last_command) {
+		cmds.msg.flags |= MIPI_DSI_MSG_LASTCOMMAND;
+		flags |= DSI_CTRL_CMD_LAST_COMMAND;
+	}
+	cmds.msg.rx_buf = &elvss_val;
+	cmds.msg.rx_len = 1;
+	rc = dsi_ctrl_cmd_transfer(ctrl->ctrl, &cmds.msg, &flags);
+	if (rc <= 0) {
+		DSI_ERR("rx cmd transfer failed rc=%d\n", rc);
+		goto error;
+	}
+
+	DSI_INFO("elvss val = 0x%x\n", elvss_val);
+error:
+	if (elvss_val != 0)
+		return elvss_val;
+	return 0;
+}
+
+static int dsi_display_elvss_read(struct dsi_display *display)
+{
+	struct dsi_display_ctrl *m_ctrl;
+	int rc;
+
+	DSI_DEBUG("++\n");
+
+	m_ctrl = &display->ctrl[display->cmd_master_idx];
+
+	rc = dsi_display_cmd_engine_enable(display);
+	if (rc) {
+		DSI_ERR("cmd engine enable failed\n");
+		return 0;
+	}
+
+	rc = dsi_display_read_elvss_status(m_ctrl, display->panel);
+	if (rc <= 0) {
+		DSI_ERR("[%s] read elvss failed on master,rc=%d\n",
+		       display->name, rc);
+		goto exit;
+	}
+
+exit:
+	dsi_display_cmd_engine_disable(display);
+	return rc;
+}
+
+int dsi_display_read_elvss_volt(void *display)
+{
+	struct dsi_display *dsi_display = display;
+	struct dsi_panel *panel;
+	int rc = 0x1;
+	int elvss_vl = 0;
+	static bool read_flag = false;
+
+	if (read_flag)
+		return rc;
+
+	if (!dsi_display || !dsi_display->panel)
+		return -EINVAL;
+
+	panel = dsi_display->panel;
+
+	dsi_panel_acquire_panel_lock(panel);
+
+	if (!panel->panel_initialized) {
+		DSI_WARN("Panel not initialized\n");
+		goto release_panel_lock;
+	}
+
+	dsi_display_clk_ctrl(dsi_display->dsi_clk_handle,
+		DSI_ALL_CLKS, DSI_CLK_ON);
+
+	dsi_panel_get_elvss_data(panel);
+	elvss_vl = dsi_display_elvss_read(dsi_display);
+	dsi_panel_get_elvss_data_1(panel);
+	if ( elvss_vl > 0) {
+		dsi_panel_set_elvss_dim_off(panel, elvss_vl);
+		dsi_panel_parse_elvss_config(panel, elvss_vl);
+		read_flag = true;
+	} else {
+		elvss_vl = 0x92;
+		dsi_panel_set_elvss_dim_off(panel, elvss_vl);
+		DSI_WARN("read elvss volt failed\n");
+	}
+	dsi_display_clk_ctrl(dsi_display->dsi_clk_handle,
+		DSI_ALL_CLKS, DSI_CLK_OFF);
+
+release_panel_lock:
+	dsi_panel_release_panel_lock(panel);
+	return rc;
+}
+
 static void _dsi_display_continuous_clk_ctrl(struct dsi_display *display,
 					     bool enable)
 {
@@ -8827,6 +8965,9 @@ int dsi_display_post_enable(struct dsi_display *display)
 
 	mutex_lock(&display->display_lock);
 
+	if (display->panel->panel_hbm_dim_off)
+		dsi_display_read_elvss_volt(display);
+
 	if (display->panel->cur_mode->dsi_mode_flags & DSI_MODE_FLAG_POMS) {
 		if (display->config.panel_mode == DSI_OP_CMD_MODE)
 			dsi_panel_mode_switch_to_cmd(display->panel);
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index daed223e3d58..006c163dd63c 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -860,7 +860,8 @@ void dsi_panel_reset_param(struct dsi_panel *panel)
 	int i;
 
 	for (i = 0; i < PARAM_ID_NUM; i++) {
-		param = &dsi_panel_param[i];
+		/* Since only panel support for now */
+		param = &dsi_panel_param[0][i];
 		param->value = param->default_value;
 	}
 }
@@ -1973,6 +1974,7 @@ 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-hbm-dim-off-command",
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -2004,6 +2006,7 @@ 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-hbm-dim-off-command-state",
 };
 
 int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
@@ -3805,6 +3808,10 @@ 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->panel_hbm_dim_off = of_property_read_bool(of_node,
+				"qcom,mdss-dsi-hbm-dim-off");
+
 	return rc;
 }
 
@@ -5046,6 +5053,151 @@ int dsi_panel_mode_switch_to_vid(struct dsi_panel *panel)
 	return rc;
 }
 
+static struct dsi_cmd_desc cmd_elv;
+static int cmd_elv_set = 0;
+static int read_elvss = 0;
+static u8 payload_elvss[2];
+
+static int dsi_panel_tx_cmd_set_elvss(struct dsi_panel *panel,
+				enum dsi_cmd_set_type type)
+{
+	int rc = 0, i = 0;
+	ssize_t len;
+	struct dsi_cmd_desc *cmds;
+	u32 count;
+	enum dsi_cmd_set_state state;
+	struct dsi_display_mode *mode;
+	const struct mipi_dsi_host_ops *ops = panel->host->ops;
+	pr_debug("\n");
+
+	if (!read_elvss)
+		return 0;
+
+	if (!panel || !panel->cur_mode)
+		return -EINVAL;
+
+	mode = panel->cur_mode;
+
+	cmds = mode->priv_info->cmd_sets[type].cmds;
+	count = mode->priv_info->cmd_sets[type].count;
+	state = mode->priv_info->cmd_sets[type].state;
+
+	if (count == 0) {
+		DSI_DEBUG("[%s] No commands to be sent for state(%d)\n",
+			 panel->name, type);
+		goto error;
+	}
+
+	for (i = 0; i < count; i++) {
+		if (state == DSI_CMD_SET_STATE_LP) {
+			cmds->msg.flags |= MIPI_DSI_MSG_USE_LPM;
+			cmd_elv.msg.flags |= MIPI_DSI_MSG_USE_LPM;
+		}
+		if (cmds->last_command) {
+			cmds->msg.flags |= MIPI_DSI_MSG_LASTCOMMAND;
+		}
+
+		if (i == 3  && (cmd_elv_set == 1)) {
+			len = ops->transfer(panel->host, &cmd_elv.msg);
+		} else {
+			len = ops->transfer(panel->host, &cmds->msg);
+		}
+
+		if (len < 0) {
+			rc = len;
+			DSI_ERR("failed to set cmds(%d), rc=%d\n", type, rc);
+			goto error;
+		}
+
+		if (cmds->post_wait_ms)
+			usleep_range(cmds->post_wait_ms*1000,
+					((cmds->post_wait_ms*1000)+10));
+		cmds++;
+	}
+
+	if (cmd_elv_set == 1) {
+		DSI_INFO("elvss data tx_buf = 0x%x, 0x%x\n", *(u8 *)cmd_elv.msg.tx_buf,
+			*((u8 *)cmd_elv.msg.tx_buf+1));
+	}
+
+error:
+	return rc;
+}
+
+int dsi_panel_get_elvss_data(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct mipi_dsi_device *dsi;
+
+	DSI_DEBUG("++\n");
+
+	if (!panel ) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+	dsi = &panel->mipi_device;
+
+	if (rc < 0)
+		DSI_ERR("failed to get elvss data\n");
+
+	return rc;
+}
+
+int dsi_panel_get_elvss_data_1(struct dsi_panel *panel)
+{
+	int rc = 0;
+	struct mipi_dsi_device *dsi;
+
+	if (!panel ) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+	dsi = &panel->mipi_device;
+
+	if (rc < 0)
+		DSI_ERR("failed to get elvss data\n");
+
+	return rc;
+}
+
+int dsi_panel_set_elvss_dim_off(struct dsi_panel *panel, u8 val)
+{
+	int rc = 0;
+	struct mipi_dsi_device *dsi;
+
+	if (!panel ) {
+		DSI_ERR("invalid params\n");
+		return -EINVAL;
+	}
+	dsi = &panel->mipi_device;
+
+	read_elvss = 1;
+	return rc;
+}
+
+int dsi_panel_parse_elvss_config(struct dsi_panel *panel, u8 elv_vl)
+{
+	u8 data[] = {0x15, 00, 00, 00, 00, 00, 02, 0xB7, 0x91};
+
+	cmd_elv.msg.type = data[0];
+	cmd_elv.last_command = (data[1] == 1 ? true : false);
+	cmd_elv.msg.channel = data[2];
+	cmd_elv.msg.flags |= (data[3] == 1 ? MIPI_DSI_MSG_REQ_ACK : 0);
+	cmd_elv.msg.ctrl = 0;
+	cmd_elv.post_wait_ms = data[4];
+	cmd_elv.msg.tx_len = ((data[5] << 8) | data[6]);
+
+	payload_elvss[0] = data[7];
+	payload_elvss[1] = elv_vl & 0x7F;
+	cmd_elv.msg.tx_buf = payload_elvss;
+
+	if (cmd_elv.last_command) {
+		cmd_elv.msg.flags |= MIPI_DSI_MSG_LASTCOMMAND;
+	}
+	cmd_elv_set = 1;
+	return 0;
+}
+
 int dsi_panel_switch(struct dsi_panel *panel)
 {
 	int rc = 0;
@@ -5159,6 +5311,14 @@ int dsi_panel_post_enable(struct dsi_panel *panel)
 		       panel->name, rc);
 		goto error;
 	}
+
+	if (panel->panel_hbm_dim_off) {
+		rc = dsi_panel_tx_cmd_set_elvss(panel, DSI_CMD_SET_HBM_DIM_OFF);
+		if (rc) {
+			pr_err("[%s] failed to send DSI_CMD_SET_ON cmds, rc=%d\n",
+			       panel->name, rc);
+		}
+	}
 error:
 	mutex_unlock(&panel->panel_lock);
 	return rc;
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index f391f3795380..5bd3499c5dad 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -315,6 +315,8 @@ struct dsi_panel {
 
 	bool panel_hbm_fod;
 
+	bool panel_hbm_dim_off;
+
 	struct panel_param *param_cmds;
 };
 
@@ -461,4 +463,9 @@ int dsi_panel_set_param(struct dsi_panel *panel,
 
 void dsi_panel_reset_param(struct dsi_panel *panel);
 
+int dsi_panel_get_elvss_data(struct dsi_panel *panel);
+int dsi_panel_get_elvss_data_1(struct dsi_panel *panel);
+int dsi_panel_set_elvss_dim_off(struct dsi_panel *panel, u8 val);
+int dsi_panel_parse_elvss_config(struct dsi_panel *panel, u8 elv_vl);
+
 #endif /* _DSI_PANEL_H_ */

From 6ff2674c42920e7eb23c2b3ee828c3ea98eba43b Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Mon, 28 Oct 2019 08:58:24 -0500
Subject: [PATCH 037/116] 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: I58082c5555a4afbebebd2c1d9e8568c787143d2d
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1697612
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 40 ++++++++++++++++++++++++++++++++++++++--
 msm/dsi/dsi_panel.h |  5 ++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 006c163dd63c..e0c6f056cd0e 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -573,11 +573,17 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	if (panel->bl_config.bl_inverted_dbv)
 		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
 
+	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){
                 bl_lvl_2bytes =  ((bl_lvl & 0xff00) >> 8) | ((bl_lvl & 0xff) << 8);
                 rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl_2bytes);
-        }
-	else
+        }else
 		rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl);
 
 	if (rc < 0)
@@ -804,11 +810,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;
 };
@@ -3762,6 +3793,11 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 	panel->panel_hbm_fod = of_property_read_bool(of_node,
 				"qcom,mdss-dsi-hbm-fod");
 
+	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 5bd3499c5dad..9a9c2bf7467e 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -314,9 +314,12 @@ struct dsi_panel {
 	bool no_panel_on_read_support;
 
 	bool panel_hbm_fod;
-
 	bool panel_hbm_dim_off;
 
+	bool is_hbm_using_51_cmd;
+	bool is_hbm_on;
+	u32  bl_lvl_during_hbm;
+
 	struct panel_param *param_cmds;
 };
 

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

Added notifier to inform registered consumers about display changing
frequency.

Change-Id: Ibc2de44c680e5499282c9b0c96d3a03e4f019f8a
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697620
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index e0c6f056cd0e..f6045031ee5d 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -20,6 +20,9 @@
 #include "sde_vdc_helper.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:
@@ -5251,6 +5254,10 @@ int dsi_panel_switch(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 17b4f7ee6d8d22de9c4f9db049e92e2d1b45b89a Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 5 Dec 2019 15:09:26 -0600
Subject: [PATCH 039/116] 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: Icd29cd25e5eb4936369dfefb513e62076f994482
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697623
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 f6045031ee5d..978a747f354f 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -576,11 +576,14 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	if (panel->bl_config.bl_inverted_dbv)
 		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
 
-	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 3138d03a75d2ce3bca6bb2d553c79a86c5f34dcf Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Tue, 10 Dec 2019 13:32:51 -0600
Subject: [PATCH 040/116] 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: I5ae139d5a9099a86d94f54f7495ddf12659c98ba
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697625
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 f138e668395e..e87c3ae5c10e 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6480,11 +6480,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 b4edfbcad47f..fe479e61b1df 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -145,6 +145,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
@@ -209,6 +210,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 978a747f354f..306270032e9a 100644
--- 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"
@@ -5285,6 +5296,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;
@@ -5334,6 +5358,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);
@@ -5365,6 +5392,9 @@ int dsi_panel_post_enable(struct dsi_panel *panel)
 			       panel->name, rc);
 		}
 	}
+
+	PANEL_NOTIFY(PANEL_EVENT_DISPLAY_ON);
+
 error:
 	mutex_unlock(&panel->panel_lock);
 	return rc;
@@ -5391,6 +5421,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;
@@ -5439,6 +5471,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 f80746408c31a54965b239075fb713567923f4a6 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Mon, 16 Dec 2019 15:22:12 -0600
Subject: [PATCH 041/116] disp: msm: Support "te_chk_reg_rd" for panel's ESD

Support the panel's ESD "te_chk_reg_rd" detection and recovery which
will run every 8s to check the TE signal and power_mode for ESD
detection. If ESD detection doesn't see the TE signal or receive an
expected power_mode value, then the display driver will trigger ESD
recovery. If the ESD detection and recovery run 5 consecutive times
but can not retrieve the TE signal or/and expected power_mode, then
the display driver will call BUG() to reboot the phone.

Change-Id: Id9a161cad624746823fcbe144b050d1dbdde18cf
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697626
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 83 +++++++++++++++++++++++++++++++++++++++++--
 msm/dsi/dsi_display.h |  8 ++++-
 msm/dsi/dsi_panel.c   | 35 +++++++++---------
 msm/dsi/dsi_panel.h   |  1 +
 4 files changed, 106 insertions(+), 21 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index e87c3ae5c10e..3b7099c664e5 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -36,6 +36,7 @@
 #define MAX_TE_SOURCE_ID  2
 
 #define SEC_PANEL_NAME_MAX_LEN  256
+#define MAX_ESD_RECOVERY_RETRY 5
 
 u8 dbgfs_tx_cmd_buf[SZ_4K];
 static char dsi_display_primary[MAX_CMDLINE_PARAM_LEN];
@@ -165,6 +166,9 @@ static void dsi_display_set_ctrl_esd_check_flag(struct dsi_display *display,
 			continue;
 		ctrl->ctrl->esd_check_underway = enable;
 	}
+
+	if (enable)
+		display->disp_esd_chk_underway = enable;
 }
 
 static void dsi_display_ctrl_irq_update(struct dsi_display *display, bool en)
@@ -522,7 +526,8 @@ static void dsi_display_register_te_irq(struct dsi_display *display)
 error:
 	/* disable the TE based ESD check */
 	DSI_WARN("Unable to register for TE IRQ\n");
-	if (display->panel->esd_config.status_mode == ESD_MODE_PANEL_TE)
+	if (display->panel->esd_config.status_mode == ESD_MODE_PANEL_TE ||
+			display->panel->esd_config.status_mode == ESD_MODE_TE_CHK_REG_RD)
 		display->panel->esd_config.esd_enabled = false;
 }
 
@@ -940,6 +945,12 @@ int dsi_display_check_status(struct drm_connector *connector, void *display,
 	} else if (status_mode == ESD_MODE_PANEL_TE) {
 		rc = dsi_display_status_check_te(dsi_display, te_rechecks);
 		te_check_override = false;
+	} else if (status_mode == ESD_MODE_TE_CHK_REG_RD) {
+		rc =  dsi_display_status_check_te(dsi_display);
+		if (rc > 0) {
+			/* after checking for TE, then chk for reg_read status */
+			rc = dsi_display_status_reg_read(dsi_display);
+		}
 	} else {
 		DSI_WARN("Unsupported check status mode: %d\n", status_mode);
 		panel->esd_config.esd_enabled = false;
@@ -1712,7 +1723,8 @@ static bool dsi_display_is_te_based_esd(struct dsi_display *display)
 
 	status_mode = display->panel->esd_config.status_mode;
 
-	if (status_mode == ESD_MODE_PANEL_TE &&
+	if ((status_mode == ESD_MODE_PANEL_TE ||
+			status_mode == ESD_MODE_TE_CHK_REG_RD) &&
 			gpio_is_valid(display->disp_te_gpio))
 		return true;
 	return false;
@@ -2136,6 +2148,8 @@ static ssize_t debugfs_read_esd_check_mode(struct file *file,
 	case ESD_MODE_SW_SIM_SUCCESS:
 		rc = snprintf(buf, len, "esd_sw_sim_success");
 		break;
+	case ESD_MODE_TE_CHK_REG_RD:
+		rc = snprintf(buf, len, "te_chk_reg_rd");
 	default:
 		rc = snprintf(buf, len, "invalid");
 		break;
@@ -8789,6 +8803,67 @@ static void dsi_display_is_probed (struct dsi_display *display,
 			enable_idx, probe_status, display->name);
 }
 
+
+int dsi_display_trigger_panel_dead_event(struct dsi_display *display)
+{
+	bool panel_dead;
+	struct drm_event event;
+	struct drm_connector *drm_conn = 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);
+
+	DSI_WARN("ESD is not recovered. Start ESD recovery again\n");
+	return 0;
+}
+
+static int dsi_display_chk_esd_recovery(struct dsi_display *display)
+{
+	int ret = 0;
+	u32 status_mode;
+	static int disp_esd_trigger = 0;
+
+	status_mode = display->panel->esd_config.status_mode;
+	if (status_mode == ESD_MODE_TE_CHK_REG_RD) {
+		/*
+		 * ESD detection is to check the TE signal and reag_status
+		* therefore when disp_esd_chk_underway is set, which means the
+		* ESD recovery is running, therefore after the panel is on
+		* then check if the ESD detection can be recovered or not.
+		* if it is not, then trigger the ESD again
+		*/
+		disp_esd_trigger++;
+		if (dsi_display_status_check_te(display) <= 0) {
+			DSI_ERR("ESD: TE Check is still failed. disp_esd_trigger=%d\n",
+						disp_esd_trigger);
+		} else if (dsi_display_status_reg_read(display) <= 0) {
+			DSI_ERR("ESD: REG_READ is still failed. disp_esd_trigger=%d\n",
+						disp_esd_trigger);
+		} else {
+			display->disp_esd_chk_underway = false;
+			DSI_INFO("ESD_MODE_TE_CHK_REG_RD is good\n");
+			disp_esd_trigger = 0;
+			display->disp_esd_chk_underway = false;
+		}
+
+		if (disp_esd_trigger > 0 && disp_esd_trigger < MAX_ESD_RECOVERY_RETRY) {
+			DSI_WARN("ESD: disp_esd_trigger=%d, trigger ESD again\n");
+			dsi_display_trigger_panel_dead_event(display);
+		} else if (disp_esd_trigger >= MAX_ESD_RECOVERY_RETRY) {
+			DSI_ERR("ESD: disp_esd_trigger=%d is Max, calling BUG\n",
+										disp_esd_trigger);
+			BUG();
+		}
+		ret = -EIO;
+	} else
+		ret = 0;
+
+	return ret;
+}
+
 static int dsi_display_enable_status (struct dsi_display *display, bool enable)
 {
 	int ret = 0;
@@ -8948,7 +9023,9 @@ int dsi_display_enable(struct dsi_display *display)
 		goto error_disable_panel;
 	}
 
-	goto error;
+	if (display->disp_esd_chk_underway)
+		if (dsi_display_chk_esd_recovery(display))
+			goto error;
 
 error_disable_panel:
 	(void)dsi_panel_disable(display->panel);
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index fe479e61b1df..63b4b91faf51 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -274,6 +274,7 @@ struct dsi_display {
 	bool misr_enable;
 	u32 misr_frame_count;
 	u32 esd_trigger;
+	bool disp_esd_chk_underway;
 	/* multiple dsi error handlers */
 	struct workqueue_struct *err_workq;
 	struct work_struct fifo_underflow_work;
@@ -718,7 +719,12 @@ int dsi_display_cmd_receive(void *display, const char *cmd_buf,
 int dsi_display_motUtil_transfer(void *display, const char *cmd_buf,
 		u32 cmd_buf_len, struct motUtil *motUtil_data);
 
-
+/**
+ * dsi_display_trigger_panel_dead_event() - Trigger ESD recovery
+ *
+ * @display:            Handle to display.
+ */
+int dsi_display_trigger_panel_dead_event(struct dsi_display *display);
 /**
  * dsi_display_force_esd_disable() - check if ESD UTAG is forced to disable ESD
  * @display:            Handle to display.
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 306270032e9a..3a67bd362020 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3661,6 +3661,14 @@ 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_chk_reg_rd")) {
+			if (panel->panel_mode == DSI_OP_CMD_MODE)
+				esd_config->status_mode = ESD_MODE_TE_CHK_REG_RD;
+			else {
+				DSI_ERR("TE-CHK_REG_RD ESD not valid for video mode\n");
+				rc = -EINVAL;
+				goto error;
+			}
 		} else if (!strcmp(string, "te_signal_check")) {
 			if (panel->panel_mode == DSI_OP_CMD_MODE) {
 				esd_config->status_mode = ESD_MODE_PANEL_TE;
@@ -3692,6 +3700,13 @@ static int dsi_panel_parse_esd_config(struct dsi_panel *panel)
 		esd_mode = "bta_trigger";
 	} else if (panel->esd_config.status_mode ==  ESD_MODE_PANEL_TE) {
 		esd_mode = "te_check";
+	} else if (panel->esd_config.status_mode == ESD_MODE_TE_CHK_REG_RD) {
+		rc = dsi_panel_parse_esd_reg_read_configs(panel);
+		if (rc) {
+			DSI_ERR("failed to parse esd reg read mode params, rc=%d\n", rc);
+			goto error;
+		} else
+			esd_mode = "te_chk_reg_rd";
 	}
 
 	DSI_DEBUG("ESD enabled with mode: %s\n", esd_mode);
@@ -3907,22 +3922,6 @@ 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,
@@ -5314,6 +5313,8 @@ int dsi_panel_enable(struct dsi_panel *panel)
 	int rc = 0;
 	u8 pwr_mode;
 	static int panel_recovery_retry;
+	struct dsi_display *dsi_display = container_of(panel->host,
+										struct dsi_display, host);
 
 	if (!panel) {
 		DSI_ERR("Invalid params\n");
@@ -5349,7 +5350,7 @@ int dsi_panel_enable(struct dsi_panel *panel)
 				BUG();
 			}
 
-			dsi_panel_trigger_panel_dead_event(panel);
+			dsi_display_trigger_panel_dead_event(dsi_display);
 		} else {
 			DSI_INFO("Pwr_mode(0x0A) = 0x%x\n", pwr_mode);
 			panel_recovery_retry = 0;
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 9a9c2bf7467e..ddb0d2aaaddb 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -162,6 +162,7 @@ struct dsi_panel_reset_config {
 
 enum esd_check_status_mode {
 	ESD_MODE_REG_READ,
+	ESD_MODE_TE_CHK_REG_RD,
 	ESD_MODE_SW_BTA,
 	ESD_MODE_PANEL_TE,
 	ESD_MODE_SW_SIM_SUCCESS,

From 3c206994ac52d0f88fa84ae5820c3f4bb8dbad4c Mon Sep 17 00:00:00 2001
From: Konstantin Makariev <hcv867@motorola.com>
Date: Thu, 19 Dec 2019 13:13:53 -0600
Subject: [PATCH 042/116] msm: dsi_panel: refresh rate config option

Make refresh rate change notification configurable through
CONFIG_DRM_DYNANMIC_REFRESH_RATE defconfig option.

Change-Id: If0a9161979f8797143b9911ea2371ba0bda01e69
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697628
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 config/konadisp.conf  | 1 +
 config/konadispconf.h | 1 +
 msm/dsi/dsi_panel.c   | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/konadisp.conf b/config/konadisp.conf
index 928706fee29f..c98f8e02f196 100644
--- a/config/konadisp.conf
+++ b/config/konadisp.conf
@@ -12,3 +12,4 @@ export CONFIG_MSM_SDE_ROTATOR=y
 export CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y
 export CONFIG_DRM_SDE_RSC=y
 export CONFIG_DISPLAY_BUILD=y
+export CONFIG_DRM_DYNAMIC_REFRESH_RATE=y
diff --git a/config/konadispconf.h b/config/konadispconf.h
index 690d4ec79f41..b4dc7e829301 100644
--- a/config/konadispconf.h
+++ b/config/konadispconf.h
@@ -17,4 +17,5 @@
 #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
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 3a67bd362020..2a25cfadcec3 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -31,10 +31,11 @@
 #include "sde_vdc_helper.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
@@ -5267,10 +5268,12 @@ int dsi_panel_switch(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 1060f5f6e5460d67ebcfcfbed469b8d0a2dfea8b Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Fri, 10 Jan 2020 08:25:41 -0600
Subject: [PATCH 043/116] 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: I997fb15040102b784eeb0a7318239bda4f59ac4b
Signed-off-by: Bang Nguyen <bangnguyen@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697630
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 1 +
 msm/dsi/dsi_panel.c   | 1 +
 msm/dsi/dsi_panel.h   | 1 +
 msm/msm_drv.h         | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 3b7099c664e5..2a051509c22f 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -7206,6 +7206,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 2a25cfadcec3..7fee0b37da15 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1656,6 +1656,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 ddb0d2aaaddb..0bc4e301f545 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -309,6 +309,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 cec6d23c6bce..10fe791e267d 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -753,6 +753,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
@@ -785,6 +786,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;

From d93b18f00eaae024f68ee07bfa5e9db8565b9638 Mon Sep 17 00:00:00 2001
From: Bang Nguyen <bangnguyen@motorola.com>
Date: Thu, 16 Jan 2020 10:58:31 -0600
Subject: [PATCH 044/116] 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
---
 msm/dsi/dsi_panel.c   | 30 ++++++++++++++++++------------
 msm/sde/sde_motUtil.c |  3 +--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 7fee0b37da15..0ff25f4bfa3d 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -759,14 +759,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__);
@@ -802,17 +803,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;
-		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;
-		}
+		count = param_map_state->cmds->count;
 
+		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);
diff --git a/msm/sde/sde_motUtil.c b/msm/sde/sde_motUtil.c
index d33f11222533..d0b98d644327 100644
--- a/msm/sde/sde_motUtil.c
+++ b/msm/sde/sde_motUtil.c
@@ -214,10 +214,9 @@ 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;
-*/
 		default:
 			DRM_ERROR(" Invalid KMSPROPTEST_PROP_INDEX = %d\n",
 						input[KMSPROPTEST_PROP_INDEX]);

From b3a144132ec1037cabc19692fcf8452d095c495c Mon Sep 17 00:00:00 2001
From: amarenr <amarenr@motorola.com>
Date: Wed, 22 Apr 2020 21:04:01 +0530
Subject: [PATCH 045/116] Ensure to initialise the index variable.

After enabling CONFIG_INIT_STACK_ALL=Y, kernel crash is observed.
[    5.602434] Call trace:
[    5.602436]  dsi_display_bind+0xbec/0xeb0
[    5.602441]  component_bind_all+0x13c/0x298
[    5.602443]  msm_drm_bind+0x154/0x8f8
[    5.602446]  try_to_bring_up_master+0x220/0x290
[    5.602449]  component_add+0xc0/0x1a8
[    5.602453]  dp_display_probe+0x31c/0x428
[    5.602456]  platform_drv_probe+0x80/0xb8
[    5.602459]  really_probe+0x4c0/0x6a8
[    5.602461]  driver_probe_device+0x74/0x148
[    5.602464]  __driver_attach+0x120/0x1d8
[    5.602466]  bus_for_each_dev+0x8c/0xd8
[    5.602469]  driver_attach+0x2c/0x38
[    5.602471]  bus_add_driver+0x144/0x268
[    5.602474]  driver_register+0x78/0x110
[    5.602476]  __platform_driver_register+0x4c/0x58
[    5.602481]  dp_display_init+0x20/0x58
[    5.602484]  do_one_initcall+0x204/0x410
[    5.602488]  kernel_init_freeable+0x46c/0x538
[    5.602492]  kernel_init+0x18/0x298
[    5.602495]  ret_from_fork+0x10/0x1c
[    5.602497] Code: 9136e129 52801002 9b2826e8 91003500 (b900091f)
[    5.602501] ---[ end trace 3dfb83852f204db5 ]---
[    5.603216] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b

This patch shall avoid crash by ensuring to select
the default display type as primary.

Change-Id: Id70ffafae48214e7514e9bc303909c3294c79ecd
Reviewed-on: https://gerrit.mot.com/1540832
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Igor Kovalenko <igork@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1697632
---
 msm/dsi/dsi_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 2a051509c22f..d5dbdf629e08 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8789,7 +8789,7 @@ static void dsi_display_is_probed (struct dsi_display *display,
 					int probe_status)
 
 {
-	int enable_idx;
+	int enable_idx = 0;
 
 	if (!display->display_type)
 		enable_idx = 0;

From a26bfb7b9925173b415197fe15bb4ca71ce7f420 Mon Sep 17 00:00:00 2001
From: haojl2 <haojl2@motorola.com>
Date: Mon, 23 Dec 2019 12:11:11 +0800
Subject: [PATCH 046/116] 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
(cherry picked from commit cc607d64e1fbd02e008672485d18da1563c72c91)
Reviewed-on: https://gerrit.mot.com/1697634
---
 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 78cc98525c0dcf3d1aae26284793c872f2339c2a Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Mon, 20 Jan 2020 10:40:30 +0800
Subject: [PATCH 047/116] 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: I82d5a96b715683168ae0a609664624128cdb170e
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697637
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 0ff25f4bfa3d..0af56034a560 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3773,7 +3773,7 @@ static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
 		panel->panel_ops.parse_power_cfg = dsi_panel_parse_power_cfg;
 	}
 static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
-				struct device_node *of_node, u32 param_idx)
+				struct device_node *of_node, u32 panel_idx)
 {
 	int i, j, rc =0;
 	struct panel_param *param;
@@ -3783,8 +3783,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");
@@ -3817,16 +3820,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;
+				}
+			}
 		}
 	}
 
@@ -3838,19 +3849,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");
 
-	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;
 
@@ -3941,7 +3939,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)
@@ -3973,8 +3971,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 063b3082b6c9bc1bacf3e9abf059f9fc760a4783 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Tue, 18 Feb 2020 10:09:45 +0800
Subject: [PATCH 048/116] 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/1697638
---
 msm/dsi/dsi_panel.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  7 +++++++
 2 files changed, 50 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 0af56034a560..8bafb3e2984e 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -374,12 +374,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",
@@ -411,6 +443,14 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 		return rc;
 	}
 	DSI_INFO("%s(%s)+\n", __func__, 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);
 
@@ -439,6 +479,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,
@@ -3886,6 +3927,8 @@ static int dsi_panel_parse_mot_panel_config(struct dsi_panel *panel,
 	panel->panel_hbm_dim_off = of_property_read_bool(of_node,
 				"qcom,mdss-dsi-hbm-dim-off");
 
+	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 0bc4e301f545..4f24c07ed8dd 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -240,6 +240,10 @@ struct dsi_panel_ops {
 	int (*parse_gpios)(struct dsi_panel *panel);
 	int (*parse_power_cfg)(struct dsi_panel *panel);
 };
+enum touch_state {
+	TOUCH_DEEP_SLEEP_STATE = 0,
+	TOUCH_LOW_POWER_STATE,
+};
 
 struct dsi_panel {
 	const char *name;
@@ -323,6 +327,9 @@ struct dsi_panel {
 	u32  bl_lvl_during_hbm;
 
 	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 0c89b9e3deda34e221d4fb02f97ac818b4f62662 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Thu, 27 Feb 2020 14:01:18 +0800
Subject: [PATCH 049/116] 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: I9c3c319b6288239914092af9c0b9bfd59412fa07
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1697640
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 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 8bafb3e2984e..510caeaef03a 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -629,16 +629,6 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	if (panel->bl_config.bl_inverted_dbv)
 		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
 
-	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){
                 bl_lvl_2bytes =  ((bl_lvl & 0xff00) >> 8) | ((bl_lvl & 0xff) << 8);
                 rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl_2bytes);
@@ -705,6 +695,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;
@@ -713,6 +757,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:
@@ -875,38 +922,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,
@@ -3823,6 +3851,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");
@@ -3835,6 +3864,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];
@@ -3885,11 +3934,6 @@ static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 	panel->panel_hbm_fod = of_property_read_bool(of_node,
 				"qcom,mdss-dsi-hbm-fod");
 
-	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 4f24c07ed8dd..d922b3c9c768 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -40,6 +40,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,
@@ -322,8 +351,7 @@ struct dsi_panel {
 	bool panel_hbm_fod;
 	bool panel_hbm_dim_off;
 
-	bool is_hbm_using_51_cmd;
-	bool is_hbm_on;
+	enum panel_hbm_type hbm_type;
 	u32  bl_lvl_during_hbm;
 
 	struct panel_param *param_cmds;

From f12b293d60b91ba4da13db62765afffd7073804b Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Wed, 8 Apr 2020 14:19:27 +0800
Subject: [PATCH 050/116] 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
---
 msm/dsi/dsi_panel.c     | 9 +++++++++
 msm/dsi/dsi_panel.h     | 1 +
 msm/sde/sde_connector.c | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 510caeaef03a..766d9df9994b 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2806,6 +2806,15 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 	else
 		DSI_ERR("bl-dsc-cmd-state command state unrecognized-%s\n",
 			state);
+	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 d922b3c9c768..b5a0c9178e9d 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -155,6 +155,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 b64ea3d346ac..bc40cc07172e 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -212,7 +212,7 @@ static int sde_backlight_setup(struct sde_connector *c_conn,
 	props.type = BACKLIGHT_RAW;
 	props.power = FB_BLANK_UNBLANK;
 	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 940f8ce404e30baf1f8a4f903a2a84c87f64904e Mon Sep 17 00:00:00 2001
From: zhanggb <zhanggb@motorola.com>
Date: Thu, 23 Apr 2020 18:38:59 +0800
Subject: [PATCH 051/116] 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: I7deb8a9b78c790f80459d3780d65a57699a35fee
Reviewed-on: https://gerrit.mot.com/1540967
Reviewed-on: https://gerrit.mot.com/1697643
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c |  2 ++
 msm/dsi/dsi_panel.c   | 10 ++++++++++
 msm/dsi/dsi_panel.h   |  1 +
 msm/msm_drv.h         |  1 +
 4 files changed, 14 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index d5dbdf629e08..1eb58157e42d 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -7209,6 +7209,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 766d9df9994b..0143ad87ff4a 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -4036,6 +4036,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)
@@ -4055,6 +4056,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 b5a0c9178e9d..4f286f7fa750 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -345,6 +345,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 10fe791e267d..9b7520718baf 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -788,6 +788,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;

From 4e28bf8e23fd6cda34d83c8a794f836be85d2a57 Mon Sep 17 00:00:00 2001
From: daiss1 <daiss1@lenovo.com>
Date: Wed, 12 Aug 2020 14:05:06 +0800
Subject: [PATCH 052/116] 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: I75092e1a40213be80c74292e8c20cd332d582910
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1720143
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/sde_dsc_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/sde_dsc_helper.c b/msm/sde_dsc_helper.c
index bf764ce8ced7..a56202a16f20 100644
--- a/msm/sde_dsc_helper.c
+++ b/msm/sde_dsc_helper.c
@@ -63,7 +63,7 @@ static char sde_dsc_rc_range_min_qp[DSC_RATIO_TYPE_MAX][DSC_NUM_BUF_RANGES] = {
 static char sde_dsc_rc_range_max_qp[DSC_RATIO_TYPE_MAX][DSC_NUM_BUF_RANGES] = {
 	/* DSC v1.1 */
 	{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},
 	{7, 8, 9, 10, 11, 11, 11, 12, 13, 13, 14, 14, 15, 15, 16},
 	/* DSC v1.1 SCR and DSC v1.2 RGB 444 */
 	{4, 4, 5, 6, 7, 7, 7, 8, 9, 10, 10, 11, 11, 12, 13},

From 02e876c533e251bc1ee7ae662b8d5ba6f5c83a13 Mon Sep 17 00:00:00 2001
From: nieqiang <nieqiang@motorola.com>
Date: Thu, 20 Aug 2020 11:00:31 +0800
Subject: [PATCH 053/116] msm: modify dsi_display_status_check_te,fix rebase
 error

Fix rebase error
Modify dsi_display_status_check_te

Change-Id: I18a7418f7f827557eb1473e1c7cbf5ea32e102d7
Signed-off-by: nieqiang <nieqiang@motorola.com>
Reviewed-on: https://gerrit.mot.com/1728082
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Submit-Approved: Jira Key
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
---
 msm/dsi/dsi_display.c | 4 ++--
 msm/dsi/dsi_panel.c   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 1eb58157e42d..a95b8a70634b 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -946,7 +946,7 @@ int dsi_display_check_status(struct drm_connector *connector, void *display,
 		rc = dsi_display_status_check_te(dsi_display, te_rechecks);
 		te_check_override = false;
 	} else if (status_mode == ESD_MODE_TE_CHK_REG_RD) {
-		rc =  dsi_display_status_check_te(dsi_display);
+		rc =  dsi_display_status_check_te(dsi_display, te_rechecks);
 		if (rc > 0) {
 			/* after checking for TE, then chk for reg_read status */
 			rc = dsi_display_status_reg_read(dsi_display);
@@ -8839,7 +8839,7 @@ static int dsi_display_chk_esd_recovery(struct dsi_display *display)
 		* if it is not, then trigger the ESD again
 		*/
 		disp_esd_trigger++;
-		if (dsi_display_status_check_te(display) <= 0) {
+		if (dsi_display_status_check_te(display, 1) <= 0) {
 			DSI_ERR("ESD: TE Check is still failed. disp_esd_trigger=%d\n",
 						disp_esd_trigger);
 		} else if (dsi_display_status_reg_read(display) <= 0) {
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 0143ad87ff4a..cccfc795887f 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3850,6 +3850,8 @@ static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
 		panel->panel_ops.parse_gpios = dsi_panel_parse_gpios;
 		panel->panel_ops.parse_power_cfg = dsi_panel_parse_power_cfg;
 	}
+}
+
 static int dsi_panel_parse_param_prop(struct dsi_panel *panel,
 				struct device_node *of_node, u32 panel_idx)
 {

From d2c3fc01189a1aa9e7a196d7082a2f1dd1a4b464 Mon Sep 17 00:00:00 2001
From: daiss1 <daiss1@lenovo.com>
Date: Thu, 13 Aug 2020 17:54:00 +0800
Subject: [PATCH 054/116] fixup! (CR): disp: msm: Support "te_chk_reg_rd" for
 panel's ESD

Change-Id: I3e47e7b56dbb3ea94b12b962d944966284ae0e4d
Reviewed-on: https://gerrit.mot.com/1729480
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Submit-Approved: Jira Key
Tested-by: Jira Key
Reviewed-by: Qiang Nie <nieqiang@motorola.com>
---
 msm/dsi/dsi_display.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index a95b8a70634b..7e735115955d 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -9030,6 +9030,8 @@ int dsi_display_enable(struct dsi_display *display)
 		if (dsi_display_chk_esd_recovery(display))
 			goto error;
 
+	goto error;
+
 error_disable_panel:
 	(void)dsi_panel_disable(display->panel);
 error:

From 5cec1a05fc1188b8b6940b363e427e3d218f591c Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Wed, 21 Oct 2020 14:21:58 +0800
Subject: [PATCH 055/116] drm: mipi: Disable the MIPI DSI commands 0x2E and
 0x3E

For the Secure UI feature, the display feature, which allows host to
read-back its internal memory buffer, should be disable. The MIPI DSI
command 0x2E (read_memory_start) and 0x3E (read_memory_continue) will
be disable.

For the kernel-4.19, this is changed at drm_mipi_dsi.c.
https://gerrit.mot.com/#/c/1444417.
For the kernel-5.4 and android-R, it is not a better way to modify common
code of drm. So we move this changes to msm/dsi/dsi_ctrl.c

Change-Id: Ib41ef05902267fe6b996b46b4e3182824d961295
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1780712
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
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
---
 msm/dsi/dsi_ctrl.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/msm/dsi/dsi_ctrl.c b/msm/dsi/dsi_ctrl.c
index 278e3dcbe921..cf83c21aea88 100644
--- a/msm/dsi/dsi_ctrl.c
+++ b/msm/dsi/dsi_ctrl.c
@@ -1542,6 +1542,7 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl,
 	u8 *buffer = NULL;
 	u32 cnt = 0;
 	u8 *cmdbuf;
+	const u8 *dsi_buf;
 
 	/* Select the tx mode to transfer the command */
 	dsi_message_setup_tx_mode(dsi_ctrl, msg->tx_len, flags);
@@ -1586,6 +1587,14 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl,
 		goto kickoff;
 	}
 
+	dsi_buf = msg->tx_buf;
+	if ((dsi_buf[0] == MIPI_DCS_READ_MEMORY_START) ||
+		(dsi_buf[0] == MIPI_DCS_READ_MEMORY_CONTINUE)) {
+                DSI_CTRL_ERR(dsi_ctrl, "%s: Invalid dsi_cmd=0x%4x\n", __func__, dsi_buf[0]);
+		rc = -EINVAL;
+		goto error;
+        }
+
 	rc = mipi_dsi_create_packet(&packet, msg);
 	if (rc) {
 		DSI_CTRL_ERR(dsi_ctrl, "Failed to create message packet, rc=%d\n",

From 3d950a806b2da7003b3024d675264ea0be846f16 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Thu, 22 Oct 2020 15:03:51 +0800
Subject: [PATCH 056/116] dsi_panel: remove the unused file

This file is included from 534dfd90e.
This is a unused file.So remove it.

Change-Id: I50b1c12a515808379c7edc18d6f6b360eaccef05
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1782130
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c.orig | 4743 --------------------------------------
 1 file changed, 4743 deletions(-)
 delete mode 100644 msm/dsi/dsi_panel.c.orig

diff --git a/msm/dsi/dsi_panel.c.orig b/msm/dsi/dsi_panel.c.orig
deleted file mode 100644
index 0c3c292a35de..000000000000
--- a/msm/dsi/dsi_panel.c.orig
+++ /dev/null
@@ -1,4743 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
- */
-
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
-#include <linux/of_gpio.h>
-#include <linux/pwm.h>
-#include <video/mipi_display.h>
-
-#include "dsi_panel.h"
-#include "dsi_ctrl_hw.h"
-#include "dsi_parser.h"
-#include "sde_dsc_helper.h"
-#include "sde_vdc_helper.h"
-
-/**
- * topology is currently defined by a set of following 3 values:
- * 1. num of layer mixers
- * 2. num of compression encoders
- * 3. num of interfaces
- */
-#define TOPOLOGY_SET_LEN 3
-#define MAX_TOPOLOGY 5
-
-#define DSI_PANEL_DEFAULT_LABEL  "Default dsi panel"
-
-#define DEFAULT_PANEL_JITTER_NUMERATOR		2
-#define DEFAULT_PANEL_JITTER_DENOMINATOR	1
-#define DEFAULT_PANEL_JITTER_ARRAY_SIZE		2
-#define MAX_PANEL_JITTER		10
-#define DEFAULT_PANEL_PREFILL_LINES	25
-#define HIGH_REFRESH_RATE_THRESHOLD_TIME_US	500
-<<<<<<< HEAD
-#define MIN_PREFILL_LINES      40
-=======
-#define MIN_PREFILL_LINES      35
-#define DSI_PANEL_UNKNOWN_PANEL_NAME	"unknown"
-#define DSI_PANEL_PANEL_DEFAULT_VER 	0xffffffffffffffff
->>>>>>> cb5f0299... IKSWR-998: disp: msm: dsi: parsing BL setting ESD and panel
-
-static void dsi_dce_prepare_pps_header(char *buf, u32 pps_delay_ms)
-{
-	char *bp;
-
-	bp = buf;
-	/* First 7 bytes are cmd header */
-	*bp++ = 0x0A;
-	*bp++ = 1;
-	*bp++ = 0;
-	*bp++ = 0;
-	*bp++ = pps_delay_ms;
-	*bp++ = 0;
-	*bp++ = 128;
-}
-
-static int dsi_dsc_create_pps_buf_cmd(struct msm_display_dsc_info *dsc,
-	char *buf, int pps_id, u32 size)
-{
-	dsi_dce_prepare_pps_header(buf, dsc->pps_delay_ms);
-	buf += DSI_CMD_PPS_HDR_SIZE;
-	return sde_dsc_create_pps_buf_cmd(dsc, buf, pps_id,
-			size);
-}
-
-static int dsi_vdc_create_pps_buf_cmd(struct msm_display_vdc_info *vdc,
-	char *buf, int pps_id, u32 size)
-{
-	dsi_dce_prepare_pps_header(buf, vdc->pps_delay_ms);
-	buf += DSI_CMD_PPS_HDR_SIZE;
-	return sde_vdc_create_pps_buf_cmd(vdc, buf, pps_id,
-			size);
-}
-
-static int dsi_panel_vreg_get(struct dsi_panel *panel)
-{
-	int rc = 0;
-	int i;
-	struct regulator *vreg = NULL;
-
-	for (i = 0; i < panel->power_info.count; i++) {
-		vreg = devm_regulator_get(panel->parent,
-					  panel->power_info.vregs[i].vreg_name);
-		rc = PTR_RET(vreg);
-		if (rc) {
-			DSI_ERR("failed to get %s regulator\n",
-			       panel->power_info.vregs[i].vreg_name);
-			goto error_put;
-		}
-		panel->power_info.vregs[i].vreg = vreg;
-	}
-
-	return rc;
-error_put:
-	for (i = i - 1; i >= 0; i--) {
-		devm_regulator_put(panel->power_info.vregs[i].vreg);
-		panel->power_info.vregs[i].vreg = NULL;
-	}
-	return rc;
-}
-
-static int dsi_panel_vreg_put(struct dsi_panel *panel)
-{
-	int rc = 0;
-	int i;
-
-	for (i = panel->power_info.count - 1; i >= 0; i--)
-		devm_regulator_put(panel->power_info.vregs[i].vreg);
-
-	return rc;
-}
-
-static int dsi_panel_gpio_request(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_panel_reset_config *r_config = &panel->reset_config;
-
-	if (gpio_is_valid(r_config->reset_gpio)) {
-		rc = gpio_request(r_config->reset_gpio, "reset_gpio");
-		if (rc) {
-			DSI_ERR("request for reset_gpio failed, rc=%d\n", rc);
-			goto error;
-		}
-	}
-
-	if (gpio_is_valid(r_config->disp_en_gpio)) {
-		rc = gpio_request(r_config->disp_en_gpio, "disp_en_gpio");
-		if (rc) {
-			DSI_ERR("request for disp_en_gpio failed, rc=%d\n", rc);
-			goto error_release_reset;
-		}
-	}
-
-	if (gpio_is_valid(panel->bl_config.en_gpio)) {
-		rc = gpio_request(panel->bl_config.en_gpio, "bklt_en_gpio");
-		if (rc) {
-			DSI_ERR("request for bklt_en_gpio failed, rc=%d\n", rc);
-			goto error_release_disp_en;
-		}
-	}
-
-	if (gpio_is_valid(r_config->lcd_mode_sel_gpio)) {
-		rc = gpio_request(r_config->lcd_mode_sel_gpio, "mode_gpio");
-		if (rc) {
-			DSI_ERR("request for mode_gpio failed, rc=%d\n", rc);
-			goto error_release_mode_sel;
-		}
-	}
-
-	if (gpio_is_valid(panel->panel_test_gpio)) {
-		rc = gpio_request(panel->panel_test_gpio, "panel_test_gpio");
-		if (rc) {
-			DSI_WARN("request for panel_test_gpio failed, rc=%d\n",
-				 rc);
-			panel->panel_test_gpio = -1;
-			rc = 0;
-		}
-	}
-
-	goto error;
-error_release_mode_sel:
-	if (gpio_is_valid(panel->bl_config.en_gpio))
-		gpio_free(panel->bl_config.en_gpio);
-error_release_disp_en:
-	if (gpio_is_valid(r_config->disp_en_gpio))
-		gpio_free(r_config->disp_en_gpio);
-error_release_reset:
-	if (gpio_is_valid(r_config->reset_gpio))
-		gpio_free(r_config->reset_gpio);
-error:
-	return rc;
-}
-
-static int dsi_panel_gpio_release(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_panel_reset_config *r_config = &panel->reset_config;
-
-	if (gpio_is_valid(r_config->reset_gpio))
-		gpio_free(r_config->reset_gpio);
-
-	if (gpio_is_valid(r_config->disp_en_gpio))
-		gpio_free(r_config->disp_en_gpio);
-
-	if (gpio_is_valid(panel->bl_config.en_gpio))
-		gpio_free(panel->bl_config.en_gpio);
-
-	if (gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))
-		gpio_free(panel->reset_config.lcd_mode_sel_gpio);
-
-	if (gpio_is_valid(panel->panel_test_gpio))
-		gpio_free(panel->panel_test_gpio);
-
-	return rc;
-}
-
-int dsi_panel_trigger_esd_attack(struct dsi_panel *panel)
-{
-	struct dsi_panel_reset_config *r_config;
-
-	if (!panel) {
-		DSI_ERR("Invalid panel param\n");
-		return -EINVAL;
-	}
-
-	r_config = &panel->reset_config;
-	if (!r_config) {
-		DSI_ERR("Invalid panel reset configuration\n");
-		return -EINVAL;
-	}
-
-	if (gpio_is_valid(r_config->reset_gpio)) {
-		gpio_set_value(r_config->reset_gpio, 0);
-		DSI_INFO("GPIO pulled low to simulate ESD\n");
-		return 0;
-	}
-	DSI_ERR("failed to pull down gpio\n");
-	return -EINVAL;
-}
-
-static int dsi_panel_reset(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_panel_reset_config *r_config = &panel->reset_config;
-	int i;
-
-	if (gpio_is_valid(panel->reset_config.disp_en_gpio)) {
-		rc = gpio_direction_output(panel->reset_config.disp_en_gpio, 1);
-		if (rc) {
-			DSI_ERR("unable to set dir for disp gpio rc=%d\n", rc);
-			goto exit;
-		}
-	}
-
-	if (r_config->count) {
-		rc = gpio_direction_output(r_config->reset_gpio,
-			r_config->sequence[0].level);
-		if (rc) {
-			DSI_ERR("unable to set dir for rst gpio rc=%d\n", rc);
-			goto exit;
-		}
-	}
-
-	for (i = 0; i < r_config->count; i++) {
-		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(panel->bl_config.en_gpio)) {
-		rc = gpio_direction_output(panel->bl_config.en_gpio, 1);
-		if (rc)
-			DSI_ERR("unable to set dir for bklt gpio rc=%d\n", rc);
-	}
-
-	if (gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio)) {
-		bool out = true;
-
-		if ((panel->reset_config.mode_sel_state == MODE_SEL_DUAL_PORT)
-				|| (panel->reset_config.mode_sel_state
-					== MODE_GPIO_LOW))
-			out = false;
-		else if ((panel->reset_config.mode_sel_state
-				== MODE_SEL_SINGLE_PORT) ||
-				(panel->reset_config.mode_sel_state
-				 == MODE_GPIO_HIGH))
-			out = true;
-
-		rc = gpio_direction_output(
-			panel->reset_config.lcd_mode_sel_gpio, out);
-		if (rc)
-			DSI_ERR("unable to set dir for mode gpio rc=%d\n", rc);
-	}
-
-	if (gpio_is_valid(panel->panel_test_gpio)) {
-		rc = gpio_direction_input(panel->panel_test_gpio);
-		if (rc)
-			DSI_WARN("unable to set dir for panel test gpio rc=%d\n",
-					rc);
-	}
-
-exit:
-	return rc;
-}
-
-static int dsi_panel_set_pinctrl_state(struct dsi_panel *panel, bool enable)
-{
-	int rc = 0;
-	struct pinctrl_state *state;
-
-	if (panel->host_config.ext_bridge_mode)
-		return 0;
-
-	if (!panel->pinctrl.pinctrl)
-		return 0;
-
-	if (enable)
-		state = panel->pinctrl.active;
-	else
-		state = panel->pinctrl.suspend;
-
-	rc = pinctrl_select_state(panel->pinctrl.pinctrl, state);
-	if (rc)
-		DSI_ERR("[%s] failed to set pin state, rc=%d\n",
-				panel->name, rc);
-
-	return rc;
-}
-
-
-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",
-				panel->name, rc);
-		goto exit;
-	}
-
-	rc = dsi_panel_set_pinctrl_state(panel, true);
-	if (rc) {
-		DSI_ERR("[%s] failed to set pinctrl, rc=%d\n", panel->name, rc);
-		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);
-
-exit:
-	return rc;
-}
-
-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);
-
-	if (gpio_is_valid(panel->reset_config.reset_gpio))
-		gpio_set_value(panel->reset_config.reset_gpio, 0);
-
-	if (gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))
-		gpio_set_value(panel->reset_config.lcd_mode_sel_gpio, 0);
-
-	if (gpio_is_valid(panel->panel_test_gpio)) {
-		rc = gpio_direction_input(panel->panel_test_gpio);
-		if (rc)
-			DSI_WARN("set dir for panel test gpio failed rc=%d\n",
-				 rc);
-	}
-
-	rc = dsi_panel_set_pinctrl_state(panel, false);
-	if (rc) {
-		DSI_ERR("[%s] failed set pinctrl state, rc=%d\n", panel->name,
-		       rc);
-	}
-
-	rc = dsi_pwr_enable_regulator(&panel->power_info, false);
-	if (rc)
-		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
-				panel->name, rc);
-
-	return rc;
-}
-static int dsi_panel_tx_cmd_set(struct dsi_panel *panel,
-				enum dsi_cmd_set_type type)
-{
-	int rc = 0, i = 0;
-	ssize_t len;
-	struct dsi_cmd_desc *cmds;
-	u32 count;
-	enum dsi_cmd_set_state state;
-	struct dsi_display_mode *mode;
-	const struct mipi_dsi_host_ops *ops = panel->host->ops;
-
-	if (!panel || !panel->cur_mode)
-		return -EINVAL;
-
-	mode = panel->cur_mode;
-
-	cmds = mode->priv_info->cmd_sets[type].cmds;
-	count = mode->priv_info->cmd_sets[type].count;
-	state = mode->priv_info->cmd_sets[type].state;
-
-	if (count == 0) {
-		DSI_DEBUG("[%s] No commands to be sent for state(%d)\n",
-			 panel->name, type);
-		goto error;
-	}
-
-	for (i = 0; i < count; i++) {
-		if (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;
-
-		if (type == DSI_CMD_SET_VID_TO_CMD_SWITCH)
-			cmds->msg.flags |= MIPI_DSI_MSG_ASYNC_OVERRIDE;
-
-		len = ops->transfer(panel->host, &cmds->msg);
-		if (len < 0) {
-			rc = len;
-			DSI_ERR("failed to set cmds(%d), rc=%d\n", type, rc);
-			goto error;
-		}
-		if (cmds->post_wait_ms)
-			usleep_range(cmds->post_wait_ms*1000,
-					((cmds->post_wait_ms*1000)+10));
-		cmds++;
-	}
-error:
-	return rc;
-}
-
-static int dsi_panel_pinctrl_deinit(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (panel->host_config.ext_bridge_mode)
-		return 0;
-
-	devm_pinctrl_put(panel->pinctrl.pinctrl);
-
-	return rc;
-}
-
-static int dsi_panel_pinctrl_init(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (panel->host_config.ext_bridge_mode)
-		return 0;
-
-	/* TODO:  pinctrl is defined in dsi dt node */
-	panel->pinctrl.pinctrl = devm_pinctrl_get(panel->parent);
-	if (IS_ERR_OR_NULL(panel->pinctrl.pinctrl)) {
-		rc = PTR_ERR(panel->pinctrl.pinctrl);
-		DSI_ERR("failed to get pinctrl, rc=%d\n", rc);
-		goto error;
-	}
-
-	panel->pinctrl.active = pinctrl_lookup_state(panel->pinctrl.pinctrl,
-						       "panel_active");
-	if (IS_ERR_OR_NULL(panel->pinctrl.active)) {
-		rc = PTR_ERR(panel->pinctrl.active);
-		DSI_ERR("failed to get pinctrl active state, rc=%d\n", rc);
-		goto error;
-	}
-
-	panel->pinctrl.suspend =
-		pinctrl_lookup_state(panel->pinctrl.pinctrl, "panel_suspend");
-
-	if (IS_ERR_OR_NULL(panel->pinctrl.suspend)) {
-		rc = PTR_ERR(panel->pinctrl.suspend);
-		DSI_ERR("failed to get pinctrl suspend state, rc=%d\n", rc);
-		goto error;
-	}
-
-	panel->pinctrl.pwm_pin =
-		pinctrl_lookup_state(panel->pinctrl.pinctrl, "pwm_pin");
-
-	if (IS_ERR_OR_NULL(panel->pinctrl.pwm_pin)) {
-		panel->pinctrl.pwm_pin = NULL;
-		DSI_DEBUG("failed to get pinctrl pwm_pin");
-	}
-
-error:
-	return rc;
-}
-
-static int dsi_panel_wled_register(struct dsi_panel *panel,
-		struct dsi_backlight_config *bl)
-{
-	struct backlight_device *bd;
-
-	bd = backlight_device_get_by_type(BACKLIGHT_RAW);
-	if (!bd) {
-		DSI_ERR("[%s] fail raw backlight register rc=%d\n",
-				panel->name, -EPROBE_DEFER);
-		return -EPROBE_DEFER;
-	}
-
-	bl->raw_bd = bd;
-	return 0;
-}
-
-static int dsi_panel_update_backlight(struct dsi_panel *panel,
-	u32 bl_lvl)
-{
-	int rc = 0;
-	unsigned long mode_flags = 0;
-	struct mipi_dsi_device *dsi = NULL;
-	struct dsi_backlight_config *bl = &panel->bl_config;
-	u32 bl_lvl_2bytes;
-
-	if (!panel || (bl_lvl > 0xffff)) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	dsi = &panel->mipi_device;
-	if (unlikely(panel->bl_config.lp_mode)) {
-		mode_flags = dsi->mode_flags;
-		dsi->mode_flags |= MIPI_DSI_MODE_LPM;
-	}
-
-	if (panel->bl_config.bl_inverted_dbv)
-		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
-
-        if (bl->bl_2bytes_enable){
-                bl_lvl_2bytes =  ((bl_lvl & 0xff00) >> 8) | ((bl_lvl & 0xff) << 8);
-                rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl_2bytes);
-        }
-	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);
-
-	if (unlikely(panel->bl_config.lp_mode))
-		dsi->mode_flags = mode_flags;
-
-	return rc;
-}
-
-static int dsi_panel_update_pwm_backlight(struct dsi_panel *panel,
-	u32 bl_lvl)
-{
-	int rc = 0;
-	u32 duty = 0;
-	u32 period_ns = 0;
-	struct dsi_backlight_config *bl;
-
-	if (!panel) {
-		DSI_ERR("Invalid Params\n");
-		return -EINVAL;
-	}
-
-	bl = &panel->bl_config;
-	if (!bl->pwm_bl) {
-		DSI_ERR("pwm device not found\n");
-		return -EINVAL;
-	}
-
-	period_ns = bl->pwm_period_usecs * NSEC_PER_USEC;
-	duty = bl_lvl * period_ns;
-	duty /= bl->bl_max_level;
-
-	rc = pwm_config(bl->pwm_bl, duty, period_ns);
-	if (rc) {
-		DSI_ERR("[%s] failed to change pwm config, rc=\n", panel->name,
-			rc);
-		goto error;
-	}
-
-	if (bl_lvl == 0 && bl->pwm_enabled) {
-		pwm_disable(bl->pwm_bl);
-		bl->pwm_enabled = false;
-		return 0;
-	}
-
-	if (!bl->pwm_enabled) {
-		rc = pwm_enable(bl->pwm_bl);
-		if (rc) {
-			DSI_ERR("[%s] failed to enable pwm, rc=\n", panel->name,
-				rc);
-			goto error;
-		}
-
-		bl->pwm_enabled = true;
-	}
-
-error:
-	return rc;
-}
-
-int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
-{
-	int rc = 0;
-	struct dsi_backlight_config *bl = &panel->bl_config;
-
-	if (panel->host_config.ext_bridge_mode)
-		return 0;
-
-	DSI_DEBUG("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);
-		break;
-	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:
-		rc = dsi_panel_update_pwm_backlight(panel, bl_lvl);
-		break;
-	default:
-		DSI_ERR("Backlight type(%d) not supported\n", bl->type);
-		rc = -ENOTSUPP;
-	}
-
-	return rc;
-}
-
-static u32 dsi_panel_get_brightness(struct dsi_backlight_config *bl)
-{
-	u32 cur_bl_level;
-	struct backlight_device *bd = bl->raw_bd;
-
-	/* default the brightness level to 50% */
-	cur_bl_level = bl->bl_max_level >> 1;
-
-	switch (bl->type) {
-	case DSI_BACKLIGHT_WLED:
-		/* Try to query the backlight level from the backlight device */
-		if (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:
-	default:
-		/*
-		 * Ideally, we should read the backlight level from the
-		 * panel. For now, just set it default value.
-		 */
-		break;
-	}
-
-	DSI_DEBUG("cur_bl_level=%d\n", cur_bl_level);
-	return cur_bl_level;
-}
-
-void dsi_panel_bl_handoff(struct dsi_panel *panel)
-{
-	struct dsi_backlight_config *bl = &panel->bl_config;
-
-	bl->bl_level = dsi_panel_get_brightness(bl);
-}
-
-static int dsi_panel_pwm_register(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_backlight_config *bl = &panel->bl_config;
-
-	bl->pwm_bl = devm_of_pwm_get(panel->parent, panel->panel_of_node, NULL);
-	if (IS_ERR_OR_NULL(bl->pwm_bl)) {
-		rc = PTR_ERR(bl->pwm_bl);
-		DSI_ERR("[%s] failed to request pwm, rc=%d\n", panel->name,
-			rc);
-		return rc;
-	}
-
-	if (panel->pinctrl.pwm_pin) {
-		rc = pinctrl_select_state(panel->pinctrl.pinctrl,
-			panel->pinctrl.pwm_pin);
-		if (rc)
-			DSI_ERR("[%s] failed to set pwm pinctrl, rc=%d\n",
-				panel->name, rc);
-	}
-
-	return 0;
-}
-
-static int dsi_panel_bl_register(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_backlight_config *bl = &panel->bl_config;
-
-	if (panel->host_config.ext_bridge_mode)
-		return 0;
-
-	switch (bl->type) {
-	case DSI_BACKLIGHT_WLED:
-		rc = dsi_panel_wled_register(panel, bl);
-		break;
-	case DSI_BACKLIGHT_DCS:
-		break;
-	case DSI_BACKLIGHT_DUMMY:
-		break;
-	case DSI_BACKLIGHT_EXTERNAL:
-		break;
-	case DSI_BACKLIGHT_PWM:
-		rc = dsi_panel_pwm_register(panel);
-		break;
-	default:
-		DSI_ERR("Backlight type(%d) not supported\n", bl->type);
-		rc = -ENOTSUPP;
-		goto error;
-	}
-
-error:
-	return rc;
-}
-
-static void dsi_panel_pwm_unregister(struct dsi_panel *panel)
-{
-	struct dsi_backlight_config *bl = &panel->bl_config;
-
-	devm_pwm_put(panel->parent, bl->pwm_bl);
-}
-
-static int dsi_panel_bl_unregister(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_backlight_config *bl = &panel->bl_config;
-
-	if (panel->host_config.ext_bridge_mode)
-		return 0;
-
-	switch (bl->type) {
-	case DSI_BACKLIGHT_WLED:
-		break;
-	case DSI_BACKLIGHT_DCS:
-		break;
-	case DSI_BACKLIGHT_DUMMY:
-		break;
-	case DSI_BACKLIGHT_EXTERNAL:
-		break;
-	case DSI_BACKLIGHT_PWM:
-		dsi_panel_pwm_unregister(panel);
-		break;
-	default:
-		DSI_ERR("Backlight type(%d) not supported\n", bl->type);
-		rc = -ENOTSUPP;
-		goto error;
-	}
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_timing(struct dsi_mode_info *mode,
-				  struct dsi_parser_utils *utils)
-{
-	int rc = 0;
-	u64 tmp64 = 0;
-	struct dsi_display_mode *display_mode;
-	struct dsi_display_mode_priv_info *priv_info;
-
-	display_mode = container_of(mode, struct dsi_display_mode, timing);
-
-	priv_info = display_mode->priv_info;
-
-	rc = utils->read_u64(utils->data,
-			"qcom,mdss-dsi-panel-clockrate", &tmp64);
-	if (rc == -EOVERFLOW) {
-		tmp64 = 0;
-		rc = utils->read_u32(utils->data,
-			"qcom,mdss-dsi-panel-clockrate", (u32 *)&tmp64);
-	}
-
-	mode->clk_rate_hz = !rc ? tmp64 : 0;
-	display_mode->priv_info->clk_rate_hz = mode->clk_rate_hz;
-
-	mode->pclk_scale.numer = 1;
-	mode->pclk_scale.denom = 1;
-	display_mode->priv_info->pclk_scale = mode->pclk_scale;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-mdp-transfer-time-us",
-				&mode->mdp_transfer_time_us);
-	if (!rc)
-		display_mode->priv_info->mdp_transfer_time_us =
-			mode->mdp_transfer_time_us;
-	else
-		display_mode->priv_info->mdp_transfer_time_us = 0;
-
-	rc = utils->read_u32(utils->data,
-				"qcom,mdss-dsi-panel-framerate",
-				&mode->refresh_rate);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-panel-framerate, rc=%d\n",
-		       rc);
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-panel-width",
-				  &mode->h_active);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-panel-width, rc=%d\n",
-				rc);
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data,
-				"qcom,mdss-dsi-h-front-porch",
-				  &mode->h_front_porch);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-h-front-porch, rc=%d\n",
-		       rc);
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data,
-				"qcom,mdss-dsi-h-back-porch",
-				  &mode->h_back_porch);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-h-back-porch, rc=%d\n",
-		       rc);
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data,
-				"qcom,mdss-dsi-h-pulse-width",
-				  &mode->h_sync_width);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-h-pulse-width, rc=%d\n",
-		       rc);
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-h-sync-skew",
-				  &mode->h_skew);
-	if (rc)
-		DSI_DEBUG("qcom,mdss-dsi-h-sync-skew is not defined, rc=%d\n",
-				rc);
-
-	DSI_DEBUG("panel horz active:%d front_portch:%d back_porch:%d sync_skew:%d\n",
-		mode->h_active, mode->h_front_porch, mode->h_back_porch,
-		mode->h_sync_width);
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-panel-height",
-				  &mode->v_active);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-panel-height, rc=%d\n",
-		       rc);
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-v-back-porch",
-				  &mode->v_back_porch);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-v-back-porch, rc=%d\n",
-		       rc);
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-v-front-porch",
-				  &mode->v_front_porch);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-v-back-porch, rc=%d\n",
-		       rc);
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-v-pulse-width",
-				  &mode->v_sync_width);
-	if (rc) {
-		DSI_ERR("failed to read qcom,mdss-dsi-v-pulse-width, rc=%d\n",
-		       rc);
-		goto error;
-	}
-	DSI_DEBUG("panel vert active:%d front_portch:%d back_porch:%d pulse_width:%d\n",
-		mode->v_active, mode->v_front_porch, mode->v_back_porch,
-		mode->v_sync_width);
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_pixel_format(struct dsi_host_common_cfg *host,
-					struct dsi_parser_utils *utils,
-					const char *name)
-{
-	int rc = 0;
-	u32 bpp = 0;
-	enum dsi_pixel_format fmt;
-	const char *packing;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bpp", &bpp);
-	if (rc) {
-		DSI_ERR("[%s] failed to read qcom,mdss-dsi-bpp, rc=%d\n",
-		       name, rc);
-		return rc;
-	}
-
-	host->bpp = bpp;
-
-	switch (bpp) {
-	case 3:
-		fmt = DSI_PIXEL_FORMAT_RGB111;
-		break;
-	case 8:
-		fmt = DSI_PIXEL_FORMAT_RGB332;
-		break;
-	case 12:
-		fmt = DSI_PIXEL_FORMAT_RGB444;
-		break;
-	case 16:
-		fmt = DSI_PIXEL_FORMAT_RGB565;
-		break;
-	case 18:
-		fmt = DSI_PIXEL_FORMAT_RGB666;
-		break;
-	case 24:
-	default:
-		fmt = DSI_PIXEL_FORMAT_RGB888;
-		break;
-	}
-
-	if (fmt == DSI_PIXEL_FORMAT_RGB666) {
-		packing = utils->get_property(utils->data,
-					  "qcom,mdss-dsi-pixel-packing",
-					  NULL);
-		if (packing && !strcmp(packing, "loose"))
-			fmt = DSI_PIXEL_FORMAT_RGB666_LOOSE;
-	}
-
-	host->dst_format = fmt;
-	return rc;
-}
-
-static int dsi_panel_parse_lane_states(struct dsi_host_common_cfg *host,
-				       struct dsi_parser_utils *utils,
-				       const char *name)
-{
-	int rc = 0;
-	bool lane_enabled;
-	u32 num_of_lanes = 0;
-
-	lane_enabled = utils->read_bool(utils->data,
-					    "qcom,mdss-dsi-lane-0-state");
-	host->data_lanes |= (lane_enabled ? DSI_DATA_LANE_0 : 0);
-
-	lane_enabled = utils->read_bool(utils->data,
-					     "qcom,mdss-dsi-lane-1-state");
-	host->data_lanes |= (lane_enabled ? DSI_DATA_LANE_1 : 0);
-
-	lane_enabled = utils->read_bool(utils->data,
-					    "qcom,mdss-dsi-lane-2-state");
-	host->data_lanes |= (lane_enabled ? DSI_DATA_LANE_2 : 0);
-
-	lane_enabled = utils->read_bool(utils->data,
-					     "qcom,mdss-dsi-lane-3-state");
-	host->data_lanes |= (lane_enabled ? DSI_DATA_LANE_3 : 0);
-
-	if (host->data_lanes & DSI_DATA_LANE_0)
-		num_of_lanes++;
-	if (host->data_lanes & DSI_DATA_LANE_1)
-		num_of_lanes++;
-	if (host->data_lanes & DSI_DATA_LANE_2)
-		num_of_lanes++;
-	if (host->data_lanes & DSI_DATA_LANE_3)
-		num_of_lanes++;
-
-	host->num_data_lanes = num_of_lanes;
-
-	if (host->data_lanes == 0) {
-		DSI_ERR("[%s] No data lanes are enabled, rc=%d\n", name, rc);
-		rc = -EINVAL;
-	}
-
-	return rc;
-}
-
-static int dsi_panel_parse_color_swap(struct dsi_host_common_cfg *host,
-				      struct dsi_parser_utils *utils,
-				      const char *name)
-{
-	int rc = 0;
-	const char *swap_mode;
-
-	swap_mode = utils->get_property(utils->data,
-			"qcom,mdss-dsi-color-order", NULL);
-	if (swap_mode) {
-		if (!strcmp(swap_mode, "rgb_swap_rgb")) {
-			host->swap_mode = DSI_COLOR_SWAP_RGB;
-		} else if (!strcmp(swap_mode, "rgb_swap_rbg")) {
-			host->swap_mode = DSI_COLOR_SWAP_RBG;
-		} else if (!strcmp(swap_mode, "rgb_swap_brg")) {
-			host->swap_mode = DSI_COLOR_SWAP_BRG;
-		} else if (!strcmp(swap_mode, "rgb_swap_grb")) {
-			host->swap_mode = DSI_COLOR_SWAP_GRB;
-		} else if (!strcmp(swap_mode, "rgb_swap_gbr")) {
-			host->swap_mode = DSI_COLOR_SWAP_GBR;
-		} else {
-			DSI_ERR("[%s] Unrecognized color order-%s\n",
-			       name, swap_mode);
-			rc = -EINVAL;
-		}
-	} else {
-		DSI_DEBUG("[%s] Falling back to default color order\n", name);
-		host->swap_mode = DSI_COLOR_SWAP_RGB;
-	}
-
-	/* bit swap on color channel is not defined in dt */
-	host->bit_swap_red = false;
-	host->bit_swap_green = false;
-	host->bit_swap_blue = false;
-	return rc;
-}
-
-static int dsi_panel_parse_triggers(struct dsi_host_common_cfg *host,
-				    struct dsi_parser_utils *utils,
-				    const char *name)
-{
-	const char *trig;
-	int rc = 0;
-
-	trig = utils->get_property(utils->data,
-			"qcom,mdss-dsi-mdp-trigger", NULL);
-	if (trig) {
-		if (!strcmp(trig, "none")) {
-			host->mdp_cmd_trigger = DSI_TRIGGER_NONE;
-		} else if (!strcmp(trig, "trigger_te")) {
-			host->mdp_cmd_trigger = DSI_TRIGGER_TE;
-		} else if (!strcmp(trig, "trigger_sw")) {
-			host->mdp_cmd_trigger = DSI_TRIGGER_SW;
-		} else if (!strcmp(trig, "trigger_sw_te")) {
-			host->mdp_cmd_trigger = DSI_TRIGGER_SW_TE;
-		} else {
-			DSI_ERR("[%s] Unrecognized mdp trigger type (%s)\n",
-			       name, trig);
-			rc = -EINVAL;
-		}
-
-	} else {
-		DSI_DEBUG("[%s] Falling back to default MDP trigger\n",
-			 name);
-		host->mdp_cmd_trigger = DSI_TRIGGER_SW;
-	}
-
-	trig = utils->get_property(utils->data,
-			"qcom,mdss-dsi-dma-trigger", NULL);
-	if (trig) {
-		if (!strcmp(trig, "none")) {
-			host->dma_cmd_trigger = DSI_TRIGGER_NONE;
-		} else if (!strcmp(trig, "trigger_te")) {
-			host->dma_cmd_trigger = DSI_TRIGGER_TE;
-		} else if (!strcmp(trig, "trigger_sw")) {
-			host->dma_cmd_trigger = DSI_TRIGGER_SW;
-		} else if (!strcmp(trig, "trigger_sw_seof")) {
-			host->dma_cmd_trigger = DSI_TRIGGER_SW_SEOF;
-		} else if (!strcmp(trig, "trigger_sw_te")) {
-			host->dma_cmd_trigger = DSI_TRIGGER_SW_TE;
-		} else {
-			DSI_ERR("[%s] Unrecognized mdp trigger type (%s)\n",
-			       name, trig);
-			rc = -EINVAL;
-		}
-
-	} else {
-		DSI_DEBUG("[%s] Falling back to default MDP trigger\n", name);
-		host->dma_cmd_trigger = DSI_TRIGGER_SW;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-te-pin-select",
-			&host->te_mode);
-	if (rc) {
-		DSI_WARN("[%s] fallback to default te-pin-select\n", name);
-		host->te_mode = 1;
-		rc = 0;
-	}
-
-	return rc;
-}
-
-static int dsi_panel_parse_misc_host_config(struct dsi_host_common_cfg *host,
-					    struct dsi_parser_utils *utils,
-					    const char *name)
-{
-	u32 val = 0, line_no = 0, window = 0;
-	int rc = 0;
-	bool panel_cphy_mode = false;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-t-clk-post", &val);
-	if (!rc) {
-		host->t_clk_post = val;
-		DSI_DEBUG("[%s] t_clk_post = %d\n", name, val);
-	}
-
-	val = 0;
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-t-clk-pre", &val);
-	if (!rc) {
-		host->t_clk_pre = val;
-		DSI_DEBUG("[%s] t_clk_pre = %d\n", name, val);
-	}
-
-	host->ignore_rx_eot = utils->read_bool(utils->data,
-						"qcom,mdss-dsi-rx-eot-ignore");
-
-	host->append_tx_eot = utils->read_bool(utils->data,
-						"qcom,mdss-dsi-tx-eot-append");
-
-	host->ext_bridge_mode = utils->read_bool(utils->data,
-					"qcom,mdss-dsi-ext-bridge-mode");
-
-	host->force_hs_clk_lane = utils->read_bool(utils->data,
-					"qcom,mdss-dsi-force-clock-lane-hs");
-	panel_cphy_mode = utils->read_bool(utils->data,
-					"qcom,panel-cphy-mode");
-	host->phy_type = panel_cphy_mode ? DSI_PHY_TYPE_CPHY
-						: DSI_PHY_TYPE_DPHY;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-dma-schedule-line",
-				  &line_no);
-	if (rc)
-		host->dma_sched_line = 0;
-	else
-		host->dma_sched_line = line_no;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-dma-schedule-window",
-				  &window);
-	if (rc)
-		host->dma_sched_window = 0;
-	else
-		host->dma_sched_window = window;
-
-	DSI_DEBUG("[%s] DMA scheduling parameters Line: %d Window: %d\n", name,
-			host->dma_sched_line, host->dma_sched_window);
-	return 0;
-}
-
-static void dsi_panel_parse_split_link_config(struct dsi_host_common_cfg *host,
-					struct dsi_parser_utils *utils,
-					const char *name)
-{
-	int rc = 0;
-	u32 val = 0;
-	bool supported = false;
-	struct dsi_split_link_config *split_link = &host->split_link;
-
-	supported = utils->read_bool(utils->data, "qcom,split-link-enabled");
-
-	if (!supported) {
-		DSI_DEBUG("[%s] Split link is not supported\n", name);
-		split_link->split_link_enabled = false;
-		return;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,sublinks-count", &val);
-	if (rc || val < 1) {
-		DSI_DEBUG("[%s] Using default sublinks count\n", name);
-		split_link->num_sublinks = 2;
-	} else {
-		split_link->num_sublinks = val;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,lanes-per-sublink", &val);
-	if (rc || val < 1) {
-		DSI_DEBUG("[%s] Using default lanes per sublink\n", name);
-		split_link->lanes_per_sublink = 2;
-	} else {
-		split_link->lanes_per_sublink = val;
-	}
-
-	DSI_DEBUG("[%s] Split link is supported %d-%d\n", name,
-		split_link->num_sublinks, split_link->lanes_per_sublink);
-	split_link->split_link_enabled = true;
-}
-
-static int dsi_panel_parse_host_config(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_parser_utils *utils = &panel->utils;
-
-	rc = dsi_panel_parse_pixel_format(&panel->host_config, utils,
-					  panel->name);
-	if (rc) {
-		DSI_ERR("[%s] failed to get pixel format, rc=%d\n",
-		panel->name, rc);
-		goto error;
-	}
-
-	rc = dsi_panel_parse_lane_states(&panel->host_config, utils,
-					 panel->name);
-	if (rc) {
-		DSI_ERR("[%s] failed to parse lane states, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-
-	rc = dsi_panel_parse_color_swap(&panel->host_config, utils,
-					panel->name);
-	if (rc) {
-		DSI_ERR("[%s] failed to parse color swap config, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-
-	rc = dsi_panel_parse_triggers(&panel->host_config, utils,
-				      panel->name);
-	if (rc) {
-		DSI_ERR("[%s] failed to parse triggers, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-
-	rc = dsi_panel_parse_misc_host_config(&panel->host_config, utils,
-					      panel->name);
-	if (rc) {
-		DSI_ERR("[%s] failed to parse misc host config, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-
-	dsi_panel_parse_split_link_config(&panel->host_config, utils,
-						panel->name);
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_qsync_caps(struct dsi_panel *panel,
-				     struct device_node *of_node)
-{
-	int rc = 0;
-	u32 val = 0;
-
-	rc = of_property_read_u32(of_node,
-				  "qcom,mdss-dsi-qsync-min-refresh-rate",
-				  &val);
-	if (rc)
-		DSI_DEBUG("[%s] qsync min fps not defined rc:%d\n",
-			panel->name, rc);
-
-	panel->qsync_min_fps = val;
-
-	return rc;
-}
-
-static int dsi_panel_parse_dyn_clk_caps(struct dsi_panel *panel)
-{
-	int rc = 0;
-	bool supported = false;
-	struct dsi_dyn_clk_caps *dyn_clk_caps = &panel->dyn_clk_caps;
-	struct dsi_parser_utils *utils = &panel->utils;
-	const char *name = panel->name;
-	const char *type;
-
-	supported = utils->read_bool(utils->data, "qcom,dsi-dyn-clk-enable");
-
-	if (!supported) {
-		dyn_clk_caps->dyn_clk_support = false;
-		return rc;
-	}
-
-	dyn_clk_caps->bit_clk_list_len = utils->count_u32_elems(utils->data,
-			"qcom,dsi-dyn-clk-list");
-
-	if (dyn_clk_caps->bit_clk_list_len < 1) {
-		DSI_ERR("[%s] failed to get supported bit clk list\n", name);
-		return -EINVAL;
-	}
-
-	dyn_clk_caps->bit_clk_list = kcalloc(dyn_clk_caps->bit_clk_list_len,
-			sizeof(u32), GFP_KERNEL);
-	if (!dyn_clk_caps->bit_clk_list)
-		return -ENOMEM;
-
-	rc = utils->read_u32_array(utils->data, "qcom,dsi-dyn-clk-list",
-			dyn_clk_caps->bit_clk_list,
-			dyn_clk_caps->bit_clk_list_len);
-
-	if (rc) {
-		DSI_ERR("[%s] failed to parse supported bit clk list\n", name);
-		return -EINVAL;
-	}
-
-	dyn_clk_caps->dyn_clk_support = true;
-
-	type = utils->get_property(utils->data,
-		"qcom,dsi-dyn-clk-type", NULL);
-	if (!type) {
-		dyn_clk_caps->type = DSI_DYN_CLK_TYPE_LEGACY;
-		dyn_clk_caps->maintain_const_fps = false;
-		return 0;
-	}
-	if (!strcmp(type, "constant-fps-adjust-hfp")) {
-		dyn_clk_caps->type = DSI_DYN_CLK_TYPE_CONST_FPS_ADJUST_HFP;
-		dyn_clk_caps->maintain_const_fps = true;
-	} else if (!strcmp(type, "constant-fps-adjust-vfp")) {
-		dyn_clk_caps->type = DSI_DYN_CLK_TYPE_CONST_FPS_ADJUST_VFP;
-		dyn_clk_caps->maintain_const_fps = true;
-	} else {
-		dyn_clk_caps->type = DSI_DYN_CLK_TYPE_LEGACY;
-		dyn_clk_caps->maintain_const_fps = false;
-	}
-	DSI_DEBUG("Dynamic clock type is [%s]\n", type);
-	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;
-	bool supported = false;
-	struct dsi_dfps_capabilities *dfps_caps = &panel->dfps_caps;
-	struct dsi_parser_utils *utils = &panel->utils;
-	const char *name = panel->name;
-	const char *type;
-	u32 i;
-
-	supported = utils->read_bool(utils->data,
-			"qcom,mdss-dsi-pan-enable-dynamic-fps");
-
-	if (!supported) {
-		DSI_DEBUG("[%s] DFPS is not supported\n", name);
-		dfps_caps->dfps_support = false;
-		return rc;
-	}
-
-	type = utils->get_property(utils->data,
-			"qcom,mdss-dsi-pan-fps-update", NULL);
-	if (!type) {
-		DSI_ERR("[%s] dfps type not defined\n", name);
-		rc = -EINVAL;
-		goto error;
-	} else if (!strcmp(type, "dfps_suspend_resume_mode")) {
-		dfps_caps->type = DSI_DFPS_SUSPEND_RESUME;
-	} else if (!strcmp(type, "dfps_immediate_clk_mode")) {
-		dfps_caps->type = DSI_DFPS_IMMEDIATE_CLK;
-	} else if (!strcmp(type, "dfps_immediate_porch_mode_hfp")) {
-		dfps_caps->type = DSI_DFPS_IMMEDIATE_HFP;
-	} else if (!strcmp(type, "dfps_immediate_porch_mode_vfp")) {
-		dfps_caps->type = DSI_DFPS_IMMEDIATE_VFP;
-	} else {
-		DSI_ERR("[%s] dfps type is not recognized\n", name);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	dfps_caps->dfps_list_len = utils->count_u32_elems(utils->data,
-				  "qcom,dsi-supported-dfps-list");
-	if (dfps_caps->dfps_list_len < 1) {
-		DSI_ERR("[%s] dfps refresh list not present\n", name);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	dfps_caps->dfps_list = kcalloc(dfps_caps->dfps_list_len, sizeof(u32),
-			GFP_KERNEL);
-	if (!dfps_caps->dfps_list) {
-		rc = -ENOMEM;
-		goto error;
-	}
-
-	rc = utils->read_u32_array(utils->data,
-			"qcom,dsi-supported-dfps-list",
-			dfps_caps->dfps_list,
-			dfps_caps->dfps_list_len);
-	if (rc) {
-		DSI_ERR("[%s] dfps refresh rate list parse failed\n", name);
-		rc = -EINVAL;
-		goto error;
-	}
-	dfps_caps->dfps_support = true;
-
-	/* calculate max and min fps */
-	dfps_caps->max_refresh_rate = dfps_caps->dfps_list[0];
-	dfps_caps->min_refresh_rate = dfps_caps->dfps_list[0];
-
-	for (i = 1; i < dfps_caps->dfps_list_len; i++) {
-		if (dfps_caps->dfps_list[i] < dfps_caps->min_refresh_rate)
-			dfps_caps->min_refresh_rate = dfps_caps->dfps_list[i];
-		else if (dfps_caps->dfps_list[i] > dfps_caps->max_refresh_rate)
-			dfps_caps->max_refresh_rate = dfps_caps->dfps_list[i];
-	}
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_video_host_config(struct dsi_video_engine_cfg *cfg,
-					     struct dsi_parser_utils *utils,
-					     const char *name)
-{
-	int rc = 0;
-	const char *traffic_mode;
-	u32 vc_id = 0;
-	u32 val = 0;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-h-sync-pulse", &val);
-	if (rc) {
-		DSI_DEBUG("[%s] fallback to default h-sync-pulse\n", name);
-		cfg->pulse_mode_hsa_he = false;
-	} else if (val == 1) {
-		cfg->pulse_mode_hsa_he = true;
-	} else if (val == 0) {
-		cfg->pulse_mode_hsa_he = false;
-	} else {
-		DSI_ERR("[%s] Unrecognized value for mdss-dsi-h-sync-pulse\n",
-		       name);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	cfg->hfp_lp11_en = utils->read_bool(utils->data,
-						"qcom,mdss-dsi-hfp-power-mode");
-
-	cfg->hbp_lp11_en = utils->read_bool(utils->data,
-						"qcom,mdss-dsi-hbp-power-mode");
-
-	cfg->hsa_lp11_en = utils->read_bool(utils->data,
-						"qcom,mdss-dsi-hsa-power-mode");
-
-	cfg->last_line_interleave_en = utils->read_bool(utils->data,
-					"qcom,mdss-dsi-last-line-interleave");
-
-	cfg->eof_bllp_lp11_en = utils->read_bool(utils->data,
-					"qcom,mdss-dsi-bllp-eof-power-mode");
-
-	cfg->bllp_lp11_en = utils->read_bool(utils->data,
-					"qcom,mdss-dsi-bllp-power-mode");
-
-	traffic_mode = utils->get_property(utils->data,
-				       "qcom,mdss-dsi-traffic-mode",
-				       NULL);
-	if (!traffic_mode) {
-		DSI_DEBUG("[%s] Falling back to default traffic mode\n", name);
-		cfg->traffic_mode = DSI_VIDEO_TRAFFIC_SYNC_PULSES;
-	} else if (!strcmp(traffic_mode, "non_burst_sync_pulse")) {
-		cfg->traffic_mode = DSI_VIDEO_TRAFFIC_SYNC_PULSES;
-	} else if (!strcmp(traffic_mode, "non_burst_sync_event")) {
-		cfg->traffic_mode = DSI_VIDEO_TRAFFIC_SYNC_START_EVENTS;
-	} else if (!strcmp(traffic_mode, "burst_mode")) {
-		cfg->traffic_mode = DSI_VIDEO_TRAFFIC_BURST_MODE;
-	} else {
-		DSI_ERR("[%s] Unrecognized traffic mode-%s\n", name,
-		       traffic_mode);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-virtual-channel-id",
-				  &vc_id);
-	if (rc) {
-		DSI_DEBUG("[%s] Fallback to default vc id\n", name);
-		cfg->vc_id = 0;
-	} else {
-		cfg->vc_id = vc_id;
-	}
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_cmd_host_config(struct dsi_cmd_engine_cfg *cfg,
-					   struct dsi_parser_utils *utils,
-					   const char *name)
-{
-	u32 val = 0;
-	int rc = 0;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-wr-mem-start", &val);
-	if (rc) {
-		DSI_DEBUG("[%s] Fallback to default wr-mem-start\n", name);
-		cfg->wr_mem_start = 0x2C;
-	} else {
-		cfg->wr_mem_start = val;
-	}
-
-	val = 0;
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-wr-mem-continue",
-				  &val);
-	if (rc) {
-		DSI_DEBUG("[%s] Fallback to default wr-mem-continue\n", name);
-		cfg->wr_mem_continue = 0x3C;
-	} else {
-		cfg->wr_mem_continue = val;
-	}
-
-	/* TODO:  fix following */
-	cfg->max_cmd_packets_interleave = 0;
-
-	val = 0;
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-te-dcs-command",
-				  &val);
-	if (rc) {
-		DSI_DEBUG("[%s] fallback to default te-dcs-cmd\n", name);
-		cfg->insert_dcs_command = true;
-	} else if (val == 1) {
-		cfg->insert_dcs_command = true;
-	} else if (val == 0) {
-		cfg->insert_dcs_command = false;
-	} else {
-		DSI_ERR("[%s] Unrecognized value for mdss-dsi-te-dcs-command\n",
-		       name);
-		rc = -EINVAL;
-		goto error;
-	}
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_panel_mode(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_parser_utils *utils = &panel->utils;
-	bool panel_mode_switch_enabled;
-	enum dsi_op_mode panel_mode;
-	const char *mode;
-
-	mode = utils->get_property(utils->data,
-			"qcom,mdss-dsi-panel-type", NULL);
-	if (!mode) {
-		DSI_DEBUG("[%s] Fallback to default panel mode\n", panel->name);
-		panel_mode = DSI_OP_VIDEO_MODE;
-	} else if (!strcmp(mode, "dsi_video_mode")) {
-		panel_mode = DSI_OP_VIDEO_MODE;
-	} else if (!strcmp(mode, "dsi_cmd_mode")) {
-		panel_mode = DSI_OP_CMD_MODE;
-	} else {
-		DSI_ERR("[%s] Unrecognized panel type-%s\n", panel->name, mode);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	panel_mode_switch_enabled = utils->read_bool(utils->data,
-					"qcom,mdss-dsi-panel-mode-switch");
-
-	DSI_DEBUG("%s: panel operating mode switch feature %s\n", __func__,
-		(panel_mode_switch_enabled ? "enabled" : "disabled"));
-
-	if (panel_mode == DSI_OP_VIDEO_MODE || panel_mode_switch_enabled) {
-		rc = dsi_panel_parse_video_host_config(&panel->video_config,
-						       utils,
-						       panel->name);
-		if (rc) {
-			DSI_ERR("[%s] Failed to parse video host cfg, rc=%d\n",
-			       panel->name, rc);
-			goto error;
-		}
-	}
-
-	if (panel_mode == DSI_OP_CMD_MODE || panel_mode_switch_enabled) {
-		rc = dsi_panel_parse_cmd_host_config(&panel->cmd_config,
-						     utils,
-						     panel->name);
-		if (rc) {
-			DSI_ERR("[%s] Failed to parse cmd host config, rc=%d\n",
-			       panel->name, rc);
-			goto error;
-		}
-	}
-
-	panel->poms_align_vsync = utils->read_bool(utils->data,
-					"qcom,poms-align-panel-vsync");
-	panel->panel_mode = panel_mode;
-	panel->panel_mode_switch_enabled = panel_mode_switch_enabled;
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_phy_props(struct dsi_panel *panel)
-{
-	int rc = 0;
-	u32 val = 0;
-	const char *str;
-	struct dsi_panel_phy_props *props = &panel->phy_props;
-	struct dsi_parser_utils *utils = &panel->utils;
-	const char *name = panel->name;
-
-	rc = utils->read_u32(utils->data,
-		  "qcom,mdss-pan-physical-width-dimension", &val);
-	if (rc) {
-		DSI_DEBUG("[%s] Physical panel width is not defined\n", name);
-		props->panel_width_mm = 0;
-		rc = 0;
-	} else {
-		props->panel_width_mm = val;
-	}
-
-	rc = utils->read_u32(utils->data,
-				  "qcom,mdss-pan-physical-height-dimension",
-				  &val);
-	if (rc) {
-		DSI_DEBUG("[%s] Physical panel height is not defined\n", name);
-		props->panel_height_mm = 0;
-		rc = 0;
-	} else {
-		props->panel_height_mm = val;
-	}
-
-	str = utils->get_property(utils->data,
-			"qcom,mdss-dsi-panel-orientation", NULL);
-	if (!str) {
-		props->rotation = DSI_PANEL_ROTATE_NONE;
-	} else if (!strcmp(str, "180")) {
-		props->rotation = DSI_PANEL_ROTATE_HV_FLIP;
-	} else if (!strcmp(str, "hflip")) {
-		props->rotation = DSI_PANEL_ROTATE_H_FLIP;
-	} else if (!strcmp(str, "vflip")) {
-		props->rotation = DSI_PANEL_ROTATE_V_FLIP;
-	} else {
-		DSI_ERR("[%s] Unrecognized panel rotation-%s\n", name, str);
-		rc = -EINVAL;
-		goto error;
-	}
-error:
-	return rc;
-}
-const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
-	"qcom,mdss-dsi-pre-on-command",
-	"qcom,mdss-dsi-on-command",
-	"qcom,mdss-dsi-post-panel-on-command",
-	"qcom,mdss-dsi-pre-off-command",
-	"qcom,mdss-dsi-off-command",
-	"qcom,mdss-dsi-post-off-command",
-	"qcom,mdss-dsi-pre-res-switch",
-	"qcom,mdss-dsi-res-switch",
-	"qcom,mdss-dsi-post-res-switch",
-	"qcom,cmd-to-video-mode-switch-commands",
-	"qcom,cmd-to-video-mode-post-switch-commands",
-	"qcom,video-to-cmd-mode-switch-commands",
-	"qcom,video-to-cmd-mode-post-switch-commands",
-	"qcom,mdss-dsi-panel-status-command",
-	"qcom,mdss-dsi-lp1-command",
-	"qcom,mdss-dsi-lp2-command",
-	"qcom,mdss-dsi-nolp-command",
-	"PPS not parsed from DTSI, generated dynamically",
-	"ROI not parsed from DTSI, generated dynamically",
-	"qcom,mdss-dsi-timing-switch-command",
-	"qcom,mdss-dsi-post-mode-switch-on-command",
-	"qcom,mdss-dsi-qsync-on-commands",
-	"qcom,mdss-dsi-qsync-off-commands",
-};
-
-const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
-	"qcom,mdss-dsi-pre-on-command-state",
-	"qcom,mdss-dsi-on-command-state",
-	"qcom,mdss-dsi-post-on-command-state",
-	"qcom,mdss-dsi-pre-off-command-state",
-	"qcom,mdss-dsi-off-command-state",
-	"qcom,mdss-dsi-post-off-command-state",
-	"qcom,mdss-dsi-pre-res-switch-state",
-	"qcom,mdss-dsi-res-switch-state",
-	"qcom,mdss-dsi-post-res-switch-state",
-	"qcom,cmd-to-video-mode-switch-commands-state",
-	"qcom,cmd-to-video-mode-post-switch-commands-state",
-	"qcom,video-to-cmd-mode-switch-commands-state",
-	"qcom,video-to-cmd-mode-post-switch-commands-state",
-	"qcom,mdss-dsi-panel-status-command-state",
-	"qcom,mdss-dsi-lp1-command-state",
-	"qcom,mdss-dsi-lp2-command-state",
-	"qcom,mdss-dsi-nolp-command-state",
-	"PPS not parsed from DTSI, generated dynamically",
-	"ROI not parsed from DTSI, generated dynamically",
-	"qcom,mdss-dsi-timing-switch-command-state",
-	"qcom,mdss-dsi-post-mode-switch-on-command-state",
-	"qcom,mdss-dsi-qsync-on-commands-state",
-	"qcom,mdss-dsi-qsync-off-commands-state",
-};
-
-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;
-
-	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) {
-			DSI_ERR("format error\n");
-			return -EINVAL;
-		}
-		length -= packet_length;
-		data += packet_length;
-		count++;
-	}
-
-	*cnt = count;
-	return 0;
-}
-
-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);
-		cmd[i].msg.channel = data[2];
-		cmd[i].msg.flags |= data[3];
-		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 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_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 int dsi_panel_parse_cmd_sets_sub(struct dsi_panel_cmd_set *cmd,
-					enum dsi_cmd_set_type type,
-					struct dsi_parser_utils *utils)
-{
-	int rc = 0;
-	u32 length = 0;
-	const char *data;
-	const char *state;
-	u32 packet_count = 0;
-
-	data = utils->get_property(utils->data, cmd_set_prop_map[type],
-			&length);
-	if (!data) {
-		DSI_DEBUG("%s commands not defined\n", cmd_set_prop_map[type]);
-		rc = -ENOTSUPP;
-		goto error;
-	}
-
-	DSI_DEBUG("type=%d, name=%s, length=%d\n", type,
-		cmd_set_prop_map[type], length);
-
-	print_hex_dump_debug("", DUMP_PREFIX_NONE,
-		       8, 1, data, length, false);
-
-	rc = dsi_panel_get_cmd_pkt_count(data, length, &packet_count);
-	if (rc) {
-		DSI_ERR("commands failed, rc=%d\n", rc);
-		goto error;
-	}
-	DSI_DEBUG("[%s] packet-count=%d, %d\n", cmd_set_prop_map[type],
-		packet_count, length);
-
-	rc = dsi_panel_alloc_cmd_packets(cmd, packet_count);
-	if (rc) {
-		DSI_ERR("failed to allocate cmd packets, rc=%d\n", rc);
-		goto error;
-	}
-
-	rc = dsi_panel_create_cmd_packets(data, length, packet_count,
-					  cmd->cmds);
-	if (rc) {
-		DSI_ERR("failed to create cmd packets, rc=%d\n", rc);
-		goto error_free_mem;
-	}
-
-	state = utils->get_property(utils->data, cmd_set_state_map[type], NULL);
-	if (!state || !strcmp(state, "dsi_lp_mode")) {
-		cmd->state = DSI_CMD_SET_STATE_LP;
-	} else if (!strcmp(state, "dsi_hs_mode")) {
-		cmd->state = DSI_CMD_SET_STATE_HS;
-	} else {
-		DSI_ERR("[%s] command state unrecognized-%s\n",
-		       cmd_set_state_map[type], state);
-		goto error_free_mem;
-	}
-
-	return rc;
-error_free_mem:
-	kfree(cmd->cmds);
-	cmd->cmds = NULL;
-error:
-	return rc;
-
-}
-
-static int dsi_panel_parse_cmd_sets(
-		struct dsi_display_mode_priv_info *priv_info,
-		struct dsi_parser_utils *utils)
-{
-	int rc = 0;
-	struct dsi_panel_cmd_set *set;
-	u32 i;
-
-	if (!priv_info) {
-		DSI_ERR("invalid mode priv info\n");
-		return -EINVAL;
-	}
-
-	for (i = DSI_CMD_SET_PRE_ON; i < DSI_CMD_SET_MAX; i++) {
-		set = &priv_info->cmd_sets[i];
-		set->type = i;
-		set->count = 0;
-
-		if (i == DSI_CMD_SET_PPS) {
-			rc = dsi_panel_alloc_cmd_packets(set, 1);
-			if (rc)
-				DSI_ERR("failed to allocate cmd set %d, rc = %d\n",
-					i, rc);
-			set->state = DSI_CMD_SET_STATE_LP;
-		} else {
-			rc = dsi_panel_parse_cmd_sets_sub(set, i, utils);
-			if (rc)
-				DSI_DEBUG("failed to parse set %d\n", i);
-		}
-	}
-
-	rc = 0;
-	return rc;
-}
-
-static int dsi_panel_parse_reset_sequence(struct dsi_panel *panel)
-{
-	int rc = 0;
-	int i;
-	u32 length = 0;
-	u32 count = 0;
-	u32 size = 0;
-	u32 *arr_32 = NULL;
-	const u32 *arr;
-	struct dsi_parser_utils *utils = &panel->utils;
-	struct dsi_reset_seq *seq;
-
-	if (panel->host_config.ext_bridge_mode)
-		return 0;
-
-	arr = utils->get_property(utils->data,
-			"qcom,mdss-dsi-reset-sequence", &length);
-	if (!arr) {
-		DSI_ERR("[%s] dsi-reset-sequence not found\n", panel->name);
-		rc = -EINVAL;
-		goto error;
-	}
-	if (length & 0x1) {
-		DSI_ERR("[%s] syntax error for dsi-reset-sequence\n",
-		       panel->name);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	DSI_DEBUG("RESET SEQ LENGTH = %d\n", length);
-	length = length / sizeof(u32);
-
-	size = length * sizeof(u32);
-
-	arr_32 = kzalloc(size, GFP_KERNEL);
-	if (!arr_32) {
-		rc = -ENOMEM;
-		goto error;
-	}
-
-	rc = utils->read_u32_array(utils->data, "qcom,mdss-dsi-reset-sequence",
-					arr_32, length);
-	if (rc) {
-		DSI_ERR("[%s] cannot read dso-reset-seqience\n", panel->name);
-		goto error_free_arr_32;
-	}
-
-	count = length / 2;
-	size = count * sizeof(*seq);
-	seq = kzalloc(size, GFP_KERNEL);
-	if (!seq) {
-		rc = -ENOMEM;
-		goto error_free_arr_32;
-	}
-
-	panel->reset_config.sequence = seq;
-	panel->reset_config.count = count;
-
-	for (i = 0; i < length; i += 2) {
-		seq->level = arr_32[i];
-		seq->sleep_ms = arr_32[i + 1];
-		seq++;
-	}
-
-
-error_free_arr_32:
-	kfree(arr_32);
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
-{
-	struct dsi_parser_utils *utils = &panel->utils;
-	const char *string;
-	int i, rc = 0;
-
-	panel->ulps_feature_enabled =
-		utils->read_bool(utils->data, "qcom,ulps-enabled");
-
-	DSI_DEBUG("%s: ulps feature %s\n", __func__,
-		(panel->ulps_feature_enabled ? "enabled" : "disabled"));
-
-	panel->ulps_suspend_enabled =
-		utils->read_bool(utils->data, "qcom,suspend-ulps-enabled");
-
-	DSI_DEBUG("%s: ulps during suspend feature %s\n", __func__,
-		(panel->ulps_suspend_enabled ? "enabled" : "disabled"));
-
-	panel->te_using_watchdog_timer = utils->read_bool(utils->data,
-					"qcom,mdss-dsi-te-using-wd");
-
-	panel->sync_broadcast_en = utils->read_bool(utils->data,
-			"qcom,cmd-sync-wait-broadcast");
-
-	panel->lp11_init = utils->read_bool(utils->data,
-			"qcom,mdss-dsi-lp11-init");
-
-	panel->spr_info.enable = false;
-	panel->spr_info.pack_type = MSM_DISPLAY_SPR_TYPE_MAX;
-
-	rc = utils->read_string(utils->data, "qcom,spr-pack-type", &string);
-	if (!rc) {
-		// find match for pack-type string
-		for (i = 0; i < MSM_DISPLAY_SPR_TYPE_MAX; i++) {
-			if (msm_spr_pack_type_str[i] &&
-				(!strcmp(string, msm_spr_pack_type_str[i]))) {
-				panel->spr_info.enable = true;
-				panel->spr_info.pack_type = i;
-				break;
-			}
-		}
-	}
-
-	pr_debug("%s source side spr packing, pack-type %s\n",
-		panel->spr_info.enable ? "enable" : "disable",
-		panel->spr_info.enable ?
-		msm_spr_pack_type_str[panel->spr_info.pack_type] : "none");
-
-
-	return 0;
-}
-
-static int dsi_panel_parse_jitter_config(
-				struct dsi_display_mode *mode,
-				struct dsi_parser_utils *utils)
-{
-	int rc;
-	struct dsi_display_mode_priv_info *priv_info;
-	u32 jitter[DEFAULT_PANEL_JITTER_ARRAY_SIZE] = {0, 0};
-	u64 jitter_val = 0;
-
-	priv_info = mode->priv_info;
-
-	rc = utils->read_u32_array(utils->data, "qcom,mdss-dsi-panel-jitter",
-				jitter, DEFAULT_PANEL_JITTER_ARRAY_SIZE);
-	if (rc) {
-		DSI_DEBUG("panel jitter not defined rc=%d\n", rc);
-	} else {
-		jitter_val = jitter[0];
-		jitter_val = div_u64(jitter_val, jitter[1]);
-	}
-
-	if (rc || !jitter_val || (jitter_val > MAX_PANEL_JITTER)) {
-		priv_info->panel_jitter_numer = DEFAULT_PANEL_JITTER_NUMERATOR;
-		priv_info->panel_jitter_denom =
-					DEFAULT_PANEL_JITTER_DENOMINATOR;
-	} else {
-		priv_info->panel_jitter_numer = jitter[0];
-		priv_info->panel_jitter_denom = jitter[1];
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-panel-prefill-lines",
-				  &priv_info->panel_prefill_lines);
-	if (rc) {
-		DSI_DEBUG("panel prefill lines are not defined rc=%d\n", rc);
-		priv_info->panel_prefill_lines = mode->timing.v_back_porch +
-			mode->timing.v_sync_width + mode->timing.v_front_porch;
-	} else if (priv_info->panel_prefill_lines >=
-					DSI_V_TOTAL(&mode->timing)) {
-		DSI_DEBUG("invalid prefill lines config=%d setting to:%d\n",
-		priv_info->panel_prefill_lines, DEFAULT_PANEL_PREFILL_LINES);
-
-		priv_info->panel_prefill_lines = DEFAULT_PANEL_PREFILL_LINES;
-	}
-
-	return 0;
-}
-
-static int dsi_panel_parse_power_cfg(struct dsi_panel *panel)
-{
-	int rc = 0;
-	char *supply_name;
-
-	if (panel->host_config.ext_bridge_mode)
-		return 0;
-
-	if (!strcmp(panel->type, "primary"))
-		supply_name = "qcom,panel-supply-entries";
-	else
-		supply_name = "qcom,panel-sec-supply-entries";
-
-	rc = dsi_pwr_of_get_vreg_data(&panel->utils,
-			&panel->power_info, supply_name);
-	if (rc) {
-		DSI_ERR("[%s] failed to parse vregs\n", panel->name);
-		goto error;
-	}
-
-error:
-	return rc;
-}
-
-int dsi_panel_get_io_resources(struct dsi_panel *panel,
-		struct msm_io_res *io_res)
-{
-	struct list_head temp_head;
-	struct msm_io_mem_entry *io_mem, *pos, *tmp;
-	struct list_head *mem_list = &io_res->mem;
-	int i, rc = 0, address_count, pin_count;
-	u32 *pins = NULL, *address = NULL;
-	u32 base, size;
-	struct dsi_parser_utils *utils = &panel->utils;
-
-	INIT_LIST_HEAD(&temp_head);
-
-	address_count = utils->count_u32_elems(utils->data,
-				"qcom,dsi-panel-gpio-address");
-	if (address_count != 2) {
-		DSI_DEBUG("panel gpio address not defined\n");
-		return 0;
-	}
-
-	address =  kzalloc(sizeof(u32) * address_count, GFP_KERNEL);
-	if (!address)
-		return -ENOMEM;
-
-	rc = utils->read_u32_array(utils->data, "qcom,dsi-panel-gpio-address",
-				address, address_count);
-	if (rc) {
-		DSI_ERR("panel gpio address not defined correctly\n");
-		goto end;
-	}
-	base = address[0];
-	size = address[1];
-
-	pin_count = utils->count_u32_elems(utils->data,
-				"qcom,dsi-panel-gpio-pins");
-	if (pin_count < 0) {
-		DSI_ERR("panel gpio pins not defined\n");
-		rc = pin_count;
-		goto end;
-	}
-
-	pins =  kzalloc(sizeof(u32) * pin_count, GFP_KERNEL);
-	if (!pins) {
-		rc = -ENOMEM;
-		goto end;
-	}
-
-	rc = utils->read_u32_array(utils->data, "qcom,dsi-panel-gpio-pins",
-				pins, pin_count);
-	if (rc) {
-		DSI_ERR("panel gpio pins not defined correctly\n");
-		goto end;
-	}
-
-	for (i = 0; i < pin_count; i++) {
-		io_mem = kzalloc(sizeof(*io_mem), GFP_KERNEL);
-		if (!io_mem) {
-			rc = -ENOMEM;
-			goto parse_fail;
-		}
-
-		io_mem->base = base + (pins[i] * size);
-		io_mem->size = size;
-
-		list_add(&io_mem->list, &temp_head);
-	}
-
-	list_splice(&temp_head, mem_list);
-	goto end;
-
-parse_fail:
-	list_for_each_entry_safe(pos, tmp, &temp_head, list) {
-		list_del(&pos->list);
-		kzfree(pos);
-	}
-end:
-	kzfree(pins);
-	kzfree(address);
-	return rc;
-}
-
-static int dsi_panel_parse_gpios(struct dsi_panel *panel)
-{
-	int rc = 0;
-	const char *data;
-	struct dsi_parser_utils *utils = &panel->utils;
-	char *reset_gpio_name, *mode_set_gpio_name;
-
-	if (!strcmp(panel->type, "primary")) {
-		reset_gpio_name = "qcom,platform-reset-gpio";
-		mode_set_gpio_name = "qcom,panel-mode-gpio";
-	} else {
-		reset_gpio_name = "qcom,platform-sec-reset-gpio";
-		mode_set_gpio_name = "qcom,panel-sec-mode-gpio";
-	}
-
-	panel->reset_config.reset_gpio = utils->get_named_gpio(utils->data,
-					      reset_gpio_name, 0);
-	if (!gpio_is_valid(panel->reset_config.reset_gpio) &&
-		!panel->host_config.ext_bridge_mode) {
-		rc = panel->reset_config.reset_gpio;
-		DSI_ERR("[%s] failed get reset gpio, rc=%d\n", panel->name, rc);
-		goto error;
-	}
-
-	panel->reset_config.disp_en_gpio = utils->get_named_gpio(utils->data,
-						"qcom,5v-boost-gpio",
-						0);
-	if (!gpio_is_valid(panel->reset_config.disp_en_gpio)) {
-		DSI_DEBUG("[%s] 5v-boot-gpio is not set, rc=%d\n",
-			 panel->name, rc);
-		panel->reset_config.disp_en_gpio =
-				utils->get_named_gpio(utils->data,
-					"qcom,platform-en-gpio", 0);
-		if (!gpio_is_valid(panel->reset_config.disp_en_gpio)) {
-			DSI_DEBUG("[%s] platform-en-gpio is not set, rc=%d\n",
-				 panel->name, rc);
-		}
-	}
-
-	panel->reset_config.lcd_mode_sel_gpio = utils->get_named_gpio(
-		utils->data, mode_set_gpio_name, 0);
-	if (!gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))
-		DSI_DEBUG("mode gpio not specified\n");
-
-	DSI_DEBUG("mode gpio=%d\n", panel->reset_config.lcd_mode_sel_gpio);
-
-	data = utils->get_property(utils->data,
-		"qcom,mdss-dsi-mode-sel-gpio-state", NULL);
-	if (data) {
-		if (!strcmp(data, "single_port"))
-			panel->reset_config.mode_sel_state =
-				MODE_SEL_SINGLE_PORT;
-		else if (!strcmp(data, "dual_port"))
-			panel->reset_config.mode_sel_state =
-				MODE_SEL_DUAL_PORT;
-		else if (!strcmp(data, "high"))
-			panel->reset_config.mode_sel_state =
-				MODE_GPIO_HIGH;
-		else if (!strcmp(data, "low"))
-			panel->reset_config.mode_sel_state =
-				MODE_GPIO_LOW;
-	} else {
-		/* Set default mode as SPLIT mode */
-		panel->reset_config.mode_sel_state = MODE_SEL_DUAL_PORT;
-	}
-
-	/* TODO:  release memory */
-	rc = dsi_panel_parse_reset_sequence(panel);
-	if (rc) {
-		DSI_ERR("[%s] failed to parse reset sequence, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-
-	panel->panel_test_gpio = utils->get_named_gpio(utils->data,
-					"qcom,mdss-dsi-panel-test-pin",
-					0);
-	if (!gpio_is_valid(panel->panel_test_gpio))
-		DSI_DEBUG("%s:%d panel test gpio not specified\n", __func__,
-			 __LINE__);
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_bl_pwm_config(struct dsi_panel *panel)
-{
-	int rc = 0;
-	u32 val;
-	struct dsi_backlight_config *config = &panel->bl_config;
-	struct dsi_parser_utils *utils = &panel->utils;
-
-	rc = utils->read_u32(utils->data, "qcom,bl-pmic-pwm-period-usecs",
-				  &val);
-	if (rc) {
-		DSI_ERR("bl-pmic-pwm-period-usecs is not defined, rc=%d\n", rc);
-		goto error;
-	}
-	config->pwm_period_usecs = val;
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
-{
-	int rc = 0;
-	u32 val = 0;
-	const char *bl_type = NULL;
-	const char *data = NULL;
-	const char *state = NULL;
-	struct dsi_parser_utils *utils = &panel->utils;
-	char *bl_name = NULL;
-
-	if (!strcmp(panel->type, "primary"))
-		bl_name = "qcom,mdss-dsi-bl-pmic-control-type";
-	else
-		bl_name = "qcom,mdss-dsi-sec-bl-pmic-control-type";
-
-	bl_type = utils->get_property(utils->data, bl_name, NULL);
-	if (!bl_type) {
-		panel->bl_config.type = DSI_BACKLIGHT_UNKNOWN;
-	} else if (!strcmp(bl_type, "bl_ctrl_pwm")) {
-		panel->bl_config.type = DSI_BACKLIGHT_PWM;
-	} else if (!strcmp(bl_type, "bl_ctrl_wled")) {
-		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 {
-		DSI_DEBUG("[%s] bl-pmic-control-type unknown-%s\n",
-			 panel->name, bl_type);
-		panel->bl_config.type = DSI_BACKLIGHT_UNKNOWN;
-	}
-
-	data = utils->get_property(utils->data, "qcom,bl-update-flag", NULL);
-	if (!data) {
-		panel->bl_config.bl_update = BL_UPDATE_NONE;
-	} else if (!strcmp(data, "delay_until_first_frame")) {
-		panel->bl_config.bl_update = BL_UPDATE_DELAY_UNTIL_FIRST_FRAME;
-	} else {
-		DSI_DEBUG("[%s] No valid bl-update-flag: %s\n",
-						panel->name, data);
-		panel->bl_config.bl_update = BL_UPDATE_NONE;
-	}
-
-	panel->bl_config.bl_scale = MAX_BL_SCALE_LEVEL;
-	panel->bl_config.bl_scale_sv = MAX_SV_BL_SCALE_LEVEL;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bl-min-level", &val);
-	if (rc) {
-		DSI_DEBUG("[%s] bl-min-level unspecified, defaulting to zero\n",
-			 panel->name);
-		panel->bl_config.bl_min_level = 0;
-	} else {
-		panel->bl_config.bl_min_level = val;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsi-bl-max-level", &val);
-	if (rc) {
-		DSI_DEBUG("[%s] bl-max-level unspecified, defaulting to max level\n",
-			 panel->name);
-		panel->bl_config.bl_max_level = MAX_BL_LEVEL;
-	} else {
-		panel->bl_config.bl_max_level = val;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-brightness-max-level",
-		&val);
-	if (rc) {
-		DSI_DEBUG("[%s] brigheness-max-level unspecified, defaulting to 255\n",
-			 panel->name);
-		panel->bl_config.brightness_max_level = 255;
-		rc = 0;
-	} else {
-		panel->bl_config.brightness_max_level = val;
-	}
-
-	panel->bl_config.bl_inverted_dbv = utils->read_bool(utils->data,
-		"qcom,mdss-dsi-bl-inverted-dbv");
-
-	state = utils->get_property(utils->data, "qcom,bl-dsc-cmd-state", NULL);
-	if (!state || !strcmp(state, "dsi_hs_mode"))
-		panel->bl_config.lp_mode = false;
-	else if (!strcmp(state, "dsi_lp_mode"))
-		panel->bl_config.lp_mode = true;
-	else
-		DSI_ERR("bl-dsc-cmd-state command state unrecognized-%s\n",
-			state);
-	panel->bl_config.bl_2bytes_enable = utils->read_bool(utils->data,
-			"qcom,bklt-dcs-2bytes-enabled");
-
-	DSI_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) {
-			DSI_ERR("[%s] failed to parse pwm config, rc=%d\n",
-			       panel->name, rc);
-			goto error;
-		}
-	}
-
-	panel->bl_config.en_gpio = utils->get_named_gpio(utils->data,
-					      "qcom,platform-bklight-en-gpio",
-					      0);
-	if (!gpio_is_valid(panel->bl_config.en_gpio)) {
-		if (panel->bl_config.en_gpio == -EPROBE_DEFER) {
-			DSI_DEBUG("[%s] failed to get bklt gpio, rc=%d\n",
-					panel->name, rc);
-			rc = -EPROBE_DEFER;
-			goto error;
-		} else {
-			DSI_DEBUG("[%s] failed to get bklt gpio, rc=%d\n",
-					 panel->name, rc);
-			rc = 0;
-			goto error;
-		}
-	}
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_phy_timing(struct dsi_display_mode *mode,
-		struct dsi_parser_utils *utils)
-{
-	const char *data;
-	u32 len, i;
-	int rc = 0;
-	struct dsi_display_mode_priv_info *priv_info;
-	u64 pixel_clk_khz;
-
-	if (!mode || !mode->priv_info)
-		return -EINVAL;
-
-	priv_info = mode->priv_info;
-
-	data = utils->get_property(utils->data,
-			"qcom,mdss-dsi-panel-phy-timings", &len);
-	if (!data) {
-		DSI_DEBUG("Unable to read Phy timing settings\n");
-	} else {
-		priv_info->phy_timing_val =
-			kzalloc((sizeof(u32) * len), GFP_KERNEL);
-		if (!priv_info->phy_timing_val)
-			return -EINVAL;
-
-		for (i = 0; i < len; i++)
-			priv_info->phy_timing_val[i] = data[i];
-
-		priv_info->phy_timing_len = len;
-	}
-
-	if (mode->panel_mode == DSI_OP_VIDEO_MODE) {
-		/*
-		 *  For command mode we update the pclk as part of
-		 *  function dsi_panel_calc_dsi_transfer_time( )
-		 *  as we set it based on dsi clock or mdp transfer time.
-		 */
-		pixel_clk_khz = (dsi_h_total_dce(&mode->timing) *
-				DSI_V_TOTAL(&mode->timing) *
-				mode->timing.refresh_rate);
-		do_div(pixel_clk_khz, 1000);
-		mode->pixel_clk_khz = pixel_clk_khz;
-	}
-
-	return rc;
-}
-
-static int dsi_panel_parse_dsc_params(struct dsi_display_mode *mode,
-				struct dsi_parser_utils *utils)
-{
-	u32 data;
-	int rc = -EINVAL;
-	int intf_width;
-	const char *compression;
-	struct dsi_display_mode_priv_info *priv_info;
-
-	if (!mode || !mode->priv_info)
-		return -EINVAL;
-
-	priv_info = mode->priv_info;
-
-	priv_info->dsc_enabled = false;
-	compression = utils->get_property(utils->data,
-			"qcom,compression-mode", NULL);
-	if (compression && !strcmp(compression, "dsc"))
-		priv_info->dsc_enabled = true;
-
-	if (!priv_info->dsc_enabled) {
-		DSI_DEBUG("dsc compression is not enabled for the mode\n");
-		return 0;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-version", &data);
-	if (rc) {
-		priv_info->dsc.config.dsc_version_major = 0x1;
-		priv_info->dsc.config.dsc_version_minor = 0x1;
-		rc = 0;
-	} else {
-		/* BITS[0..3] provides minor version and BITS[4..7] provide
-		 * major version information
-		 */
-		priv_info->dsc.config.dsc_version_major = (data >> 4) & 0x0F;
-		priv_info->dsc.config.dsc_version_minor = data & 0x0F;
-		if ((priv_info->dsc.config.dsc_version_major != 0x1) &&
-				((priv_info->dsc.config.dsc_version_minor
-				  != 0x1) ||
-				 (priv_info->dsc.config.dsc_version_minor
-				  != 0x2))) {
-			DSI_ERR("%s:unsupported major:%d minor:%d version\n",
-					__func__,
-					priv_info->dsc.config.dsc_version_major,
-					priv_info->dsc.config.dsc_version_minor
-					);
-			rc = -EINVAL;
-			goto error;
-		}
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-scr-version", &data);
-	if (rc) {
-		priv_info->dsc.scr_rev = 0x0;
-		rc = 0;
-	} else {
-		priv_info->dsc.scr_rev = data & 0xff;
-		/* only one scr rev supported */
-		if (priv_info->dsc.scr_rev > 0x1) {
-			DSI_ERR("%s: DSC scr version:%d not supported\n",
-					__func__, priv_info->dsc.scr_rev);
-			rc = -EINVAL;
-			goto error;
-		}
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-slice-height", &data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,mdss-dsc-slice-height\n");
-		goto error;
-	}
-	priv_info->dsc.config.slice_height = data;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-slice-width", &data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,mdss-dsc-slice-width\n");
-		goto error;
-	}
-	priv_info->dsc.config.slice_width = data;
-
-	intf_width = mode->timing.h_active;
-	if (intf_width % priv_info->dsc.config.slice_width) {
-		DSI_ERR("invalid slice width for the intf width:%d slice width:%d\n",
-			intf_width, priv_info->dsc.config.slice_width);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	priv_info->dsc.config.pic_width = mode->timing.h_active;
-	priv_info->dsc.config.pic_height = mode->timing.v_active;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-slice-per-pkt", &data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,mdss-dsc-slice-per-pkt\n");
-		goto error;
-	} else if (!data || (data > 2)) {
-		DSI_ERR("invalid dsc slice-per-pkt:%d\n", data);
-		goto error;
-	}
-	priv_info->dsc.slice_per_pkt = data;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-bit-per-component",
-		&data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,mdss-dsc-bit-per-component\n");
-		goto error;
-	}
-	priv_info->dsc.config.bits_per_component = data;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-pps-delay-ms", &data);
-	if (rc) {
-		DSI_DEBUG("pps-delay-ms not specified, defaulting to 0\n");
-		data = 0;
-	}
-	priv_info->dsc.pps_delay_ms = data;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-bit-per-pixel",
-			&data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,mdss-dsc-bit-per-pixel\n");
-		goto error;
-	}
-	priv_info->dsc.config.bits_per_pixel = data << 4;
-
-	rc = utils->read_u32(utils->data, "qcom,src-chroma-format",
-			&data);
-	if (rc) {
-		DSI_DEBUG("failed to parse qcom,src-chroma-format\n");
-		rc = 0;
-		data = MSM_CHROMA_444;
-	}
-
-	priv_info->dsc.chroma_format = data;
-
-	rc = utils->read_u32(utils->data, "qcom,src-color-space",
-			&data);
-	if (rc) {
-		DSI_DEBUG("failed to parse qcom,src-color-space\n");
-		rc = 0;
-		data = MSM_RGB;
-	}
-
-	priv_info->dsc.source_color_space = data;
-
-	priv_info->dsc.config.block_pred_enable = utils->read_bool(utils->data,
-		"qcom,mdss-dsc-block-prediction-enable");
-
-	priv_info->dsc.config.slice_count = DIV_ROUND_UP(intf_width,
-		priv_info->dsc.config.slice_width);
-
-	rc = sde_dsc_populate_dsc_config(&priv_info->dsc.config,
-			priv_info->dsc.scr_rev);
-	if (rc) {
-		DSI_DEBUG("failed populating dsc params\n");
-		rc = -EINVAL;
-		goto error;
-	}
-
-	rc = sde_dsc_populate_dsc_private_params(&priv_info->dsc, intf_width);
-	if (rc) {
-		DSI_DEBUG("failed populating other dsc params\n");
-		rc = -EINVAL;
-		goto error;
-	}
-
-	priv_info->pclk_scale.numer =
-			priv_info->dsc.config.bits_per_pixel >> 4;
-	priv_info->pclk_scale.denom = msm_get_src_bpc(
-			priv_info->dsc.chroma_format,
-			priv_info->dsc.config.bits_per_component);
-
-	mode->timing.dsc_enabled = true;
-	mode->timing.dsc = &priv_info->dsc;
-	mode->timing.pclk_scale = priv_info->pclk_scale;
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_vdc_params(struct dsi_display_mode *mode,
-	struct dsi_parser_utils *utils, int traffic_mode, int panel_mode)
-{
-	u32 data;
-	int rc = -EINVAL;
-	const char *compression;
-	struct dsi_display_mode_priv_info *priv_info;
-	int intf_width;
-
-	if (!mode || !mode->priv_info)
-		return -EINVAL;
-
-	priv_info = mode->priv_info;
-
-	priv_info->vdc_enabled = false;
-	compression = utils->get_property(utils->data,
-			"qcom,compression-mode", NULL);
-	if (compression && !strcmp(compression, "vdc"))
-		priv_info->vdc_enabled = true;
-
-	if (!priv_info->vdc_enabled) {
-		DSI_DEBUG("vdc compression is not enabled for the mode\n");
-		return 0;
-	}
-
-	priv_info->vdc.panel_mode = panel_mode;
-	priv_info->vdc.traffic_mode = traffic_mode;
-
-	rc = utils->read_u32(utils->data, "qcom,vdc-version", &data);
-	if (rc) {
-		priv_info->vdc.version_major = 0x1;
-		priv_info->vdc.version_minor = 0x2;
-		priv_info->vdc.version_release = 0x0;
-		rc = 0;
-	} else {
-		/* BITS[0..3] provides minor version and BITS[4..7] provide
-		 * major version information
-		 */
-		priv_info->vdc.version_major = (data >> 4) & 0x0F;
-		priv_info->vdc.version_minor = data & 0x0F;
-		if ((priv_info->vdc.version_major != 0x1) &&
-				((priv_info->vdc.version_minor
-				  != 0x2))) {
-			DSI_ERR("%s:unsupported major:%d minor:%d version\n",
-					__func__,
-					priv_info->vdc.version_major,
-					priv_info->vdc.version_minor
-					);
-			rc = -EINVAL;
-			goto error;
-		}
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,vdc-version-release", &data);
-	if (rc) {
-		priv_info->vdc.version_release = 0x0;
-		rc = 0;
-	} else {
-		priv_info->vdc.version_release = data & 0xff;
-		/* only one release version is supported */
-		if (priv_info->vdc.version_release != 0x0) {
-			DSI_ERR("unsupported vdc release version %d\n",
-					priv_info->vdc.version_release);
-			rc = -EINVAL;
-			goto error;
-		}
-	}
-
-	DSI_INFO("vdc major: 0x%x minor : 0x%x release : 0x%x\n",
-			priv_info->vdc.version_major,
-			priv_info->vdc.version_minor,
-			priv_info->vdc.version_release);
-
-	rc = utils->read_u32(utils->data, "qcom,vdc-slice-height", &data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,vdc-slice-height\n");
-		goto error;
-	}
-	priv_info->vdc.slice_height = data;
-
-	/* slice height should be atleast 16 lines */
-	if (priv_info->vdc.slice_height < 16) {
-		DSI_ERR("invalid slice height %d\n",
-			priv_info->vdc.slice_height);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,vdc-slice-width", &data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,vdc-slice-width\n");
-		goto error;
-	}
-
-	priv_info->vdc.slice_width = data;
-
-	/*
-	 * slide-width should be multiple of 8
-	 * slice-width should be atlease 64 pixels
-	 */
-	if ((priv_info->vdc.slice_width & 7) ||
-		(priv_info->vdc.slice_width < 64)) {
-		DSI_ERR("invalid slice width:%d\n", priv_info->vdc.slice_width);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	rc = utils->read_u32(utils->data, "qcom,vdc-slice-per-pkt", &data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,vdc-slice-per-pkt\n");
-		goto error;
-	} else if (!data || (data > 2)) {
-		DSI_ERR("invalid vdc slice-per-pkt:%d\n", data);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	intf_width = mode->timing.h_active;
-	priv_info->vdc.slice_per_pkt = data;
-
-	priv_info->vdc.frame_width = mode->timing.h_active;
-	priv_info->vdc.frame_height = mode->timing.v_active;
-
-	rc = utils->read_u32(utils->data, "qcom,vdc-bit-per-component",
-		&data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,vdc-bit-per-component\n");
-		goto error;
-	}
-	priv_info->vdc.bits_per_component = data;
-
-	rc = utils->read_u32(utils->data, "qcom,mdss-pps-delay-ms", &data);
-	if (rc) {
-		DSI_DEBUG("pps-delay-ms not specified, defaulting to 0\n");
-		data = 0;
-	}
-	priv_info->vdc.pps_delay_ms = data;
-
-	rc = utils->read_u32(utils->data, "qcom,vdc-bit-per-pixel",
-			&data);
-	if (rc) {
-		DSI_ERR("failed to parse qcom,vdc-bit-per-pixel\n");
-		goto error;
-	}
-	priv_info->vdc.bits_per_pixel = data << 4;
-
-	rc = utils->read_u32(utils->data, "qcom,src-chroma-format",
-			&data);
-	if (rc) {
-		DSI_DEBUG("failed to parse qcom,src-chroma-format\n");
-		rc = 0;
-		data = MSM_CHROMA_444;
-	}
-	priv_info->vdc.chroma_format = data;
-
-	rc = utils->read_u32(utils->data, "qcom,src-color-space",
-			&data);
-	if (rc) {
-		DSI_DEBUG("failed to parse qcom,src-color-space\n");
-		rc = 0;
-		data = MSM_RGB;
-	}
-	priv_info->vdc.source_color_space = data;
-
-	rc = sde_vdc_populate_config(&priv_info->vdc,
-		intf_width, traffic_mode);
-	if (rc) {
-		DSI_DEBUG("failed populating vdc config\n");
-		rc = -EINVAL;
-		goto error;
-	}
-
-	priv_info->pclk_scale.numer =
-			priv_info->vdc.bits_per_pixel >> 4;
-	priv_info->pclk_scale.denom = msm_get_src_bpc(
-			priv_info->vdc.chroma_format,
-			priv_info->vdc.bits_per_component);
-
-	mode->timing.vdc_enabled = true;
-	mode->timing.vdc = &priv_info->vdc;
-	mode->timing.pclk_scale = priv_info->pclk_scale;
-
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_hdr_config(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct drm_panel_hdr_properties *hdr_prop;
-	struct dsi_parser_utils *utils = &panel->utils;
-
-	hdr_prop = &panel->hdr_props;
-	hdr_prop->hdr_enabled = utils->read_bool(utils->data,
-		"qcom,mdss-dsi-panel-hdr-enabled");
-
-	if (hdr_prop->hdr_enabled) {
-		rc = utils->read_u32_array(utils->data,
-				"qcom,mdss-dsi-panel-hdr-color-primaries",
-				hdr_prop->display_primaries,
-				DISPLAY_PRIMARIES_MAX);
-		if (rc) {
-			DSI_ERR("%s:%d, Unable to read color primaries,rc:%u\n",
-					__func__, __LINE__, rc);
-			hdr_prop->hdr_enabled = false;
-			return rc;
-		}
-
-		rc = utils->read_u32(utils->data,
-			"qcom,mdss-dsi-panel-peak-brightness",
-			&(hdr_prop->peak_brightness));
-		if (rc) {
-			DSI_ERR("%s:%d, Unable to read hdr brightness, rc:%u\n",
-				__func__, __LINE__, rc);
-			hdr_prop->hdr_enabled = false;
-			return rc;
-		}
-
-		rc = utils->read_u32(utils->data,
-			"qcom,mdss-dsi-panel-blackness-level",
-			&(hdr_prop->blackness_level));
-		if (rc) {
-			DSI_ERR("%s:%d, Unable to read hdr brightness, rc:%u\n",
-				__func__, __LINE__, rc);
-			hdr_prop->hdr_enabled = false;
-			return rc;
-		}
-	}
-	return 0;
-}
-
-static int dsi_panel_parse_topology(
-		struct dsi_display_mode_priv_info *priv_info,
-		struct dsi_parser_utils *utils,
-		int topology_override)
-{
-	struct msm_display_topology *topology;
-	u32 top_count, top_sel, *array = NULL;
-	int i, len = 0;
-	int rc = -EINVAL;
-
-	len = utils->count_u32_elems(utils->data, "qcom,display-topology");
-	if (len <= 0 || len % TOPOLOGY_SET_LEN ||
-			len > (TOPOLOGY_SET_LEN * MAX_TOPOLOGY)) {
-		DSI_ERR("invalid topology list for the panel, rc = %d\n", rc);
-		return rc;
-	}
-
-	top_count = len / TOPOLOGY_SET_LEN;
-
-	array = kcalloc(len, sizeof(u32), GFP_KERNEL);
-	if (!array)
-		return -ENOMEM;
-
-	rc = utils->read_u32_array(utils->data,
-			"qcom,display-topology", array, len);
-	if (rc) {
-		DSI_ERR("unable to read the display topologies, rc = %d\n", rc);
-		goto read_fail;
-	}
-
-	topology = kcalloc(top_count, sizeof(*topology), GFP_KERNEL);
-	if (!topology) {
-		rc = -ENOMEM;
-		goto read_fail;
-	}
-
-	for (i = 0; i < top_count; i++) {
-		struct msm_display_topology *top = &topology[i];
-
-		top->num_lm = array[i * TOPOLOGY_SET_LEN];
-		top->num_enc = array[i * TOPOLOGY_SET_LEN + 1];
-		top->num_intf = array[i * TOPOLOGY_SET_LEN + 2];
-	}
-
-	if (topology_override >= 0 && topology_override < top_count) {
-		DSI_INFO("override topology: cfg:%d lm:%d comp_enc:%d intf:%d\n",
-			topology_override,
-			topology[topology_override].num_lm,
-			topology[topology_override].num_enc,
-			topology[topology_override].num_intf);
-		top_sel = topology_override;
-		goto parse_done;
-	}
-
-	rc = utils->read_u32(utils->data,
-			"qcom,default-topology-index", &top_sel);
-	if (rc) {
-		DSI_ERR("no default topology selected, rc = %d\n", rc);
-		goto parse_fail;
-	}
-
-	if (top_sel >= top_count) {
-		rc = -EINVAL;
-		DSI_ERR("default topology is specified is not valid, rc = %d\n",
-			rc);
-		goto parse_fail;
-	}
-
-	DSI_INFO("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);
-
-parse_done:
-	memcpy(&priv_info->topology, &topology[top_sel],
-		sizeof(struct msm_display_topology));
-parse_fail:
-	kfree(topology);
-read_fail:
-	kfree(array);
-
-	return rc;
-}
-
-static int dsi_panel_parse_roi_alignment(struct dsi_parser_utils *utils,
-					 struct msm_roi_alignment *align)
-{
-	int len = 0, rc = 0;
-	u32 value[6];
-	struct property *data;
-
-	if (!align)
-		return -EINVAL;
-
-	memset(align, 0, sizeof(*align));
-
-	data = utils->find_property(utils->data,
-			"qcom,panel-roi-alignment", &len);
-	len /= sizeof(u32);
-	if (!data) {
-		DSI_ERR("panel roi alignment not found\n");
-		rc = -EINVAL;
-	} else if (len != 6) {
-		DSI_ERR("incorrect roi alignment len %d\n", len);
-		rc = -EINVAL;
-	} else {
-		rc = utils->read_u32_array(utils->data,
-				"qcom,panel-roi-alignment", value, len);
-		if (rc)
-			DSI_DEBUG("error reading panel roi alignment values\n");
-		else {
-			align->xstart_pix_align = value[0];
-			align->ystart_pix_align = value[1];
-			align->width_pix_align = value[2];
-			align->height_pix_align = value[3];
-			align->min_width = value[4];
-			align->min_height = value[5];
-		}
-
-		DSI_INFO("roi alignment: [%d, %d, %d, %d, %d, %d]\n",
-			align->xstart_pix_align,
-			align->width_pix_align,
-			align->ystart_pix_align,
-			align->height_pix_align,
-			align->min_width,
-			align->min_height);
-	}
-
-	return rc;
-}
-
-static int dsi_panel_parse_partial_update_caps(struct dsi_display_mode *mode,
-				struct dsi_parser_utils *utils)
-{
-	struct msm_roi_caps *roi_caps = NULL;
-	const char *data;
-	int rc = 0;
-
-	if (!mode || !mode->priv_info) {
-		DSI_ERR("invalid arguments\n");
-		return -EINVAL;
-	}
-
-	roi_caps = &mode->priv_info->roi_caps;
-
-	memset(roi_caps, 0, sizeof(*roi_caps));
-
-	data = utils->get_property(utils->data,
-		"qcom,partial-update-enabled", NULL);
-	if (data) {
-		if (!strcmp(data, "dual_roi"))
-			roi_caps->num_roi = 2;
-		else if (!strcmp(data, "single_roi"))
-			roi_caps->num_roi = 1;
-		else {
-			DSI_INFO(
-			"invalid value for qcom,partial-update-enabled: %s\n",
-			data);
-			return 0;
-		}
-	} else {
-		DSI_DEBUG("partial update disabled as the property is not set\n");
-		return 0;
-	}
-
-	roi_caps->merge_rois = utils->read_bool(utils->data,
-			"qcom,partial-update-roi-merge");
-
-	roi_caps->enabled = roi_caps->num_roi > 0;
-
-	DSI_DEBUG("partial update num_rois=%d enabled=%d\n", roi_caps->num_roi,
-			roi_caps->enabled);
-
-	if (roi_caps->enabled)
-		rc = dsi_panel_parse_roi_alignment(utils,
-				&roi_caps->align);
-
-	if (rc)
-		memset(roi_caps, 0, sizeof(*roi_caps));
-
-	return rc;
-}
-
-static int dsi_panel_parse_panel_mode_caps(struct dsi_display_mode *mode,
-				struct dsi_parser_utils *utils)
-{
-	bool vid_mode_support, cmd_mode_support;
-
-	if (!mode || !mode->priv_info) {
-		DSI_ERR("invalid arguments\n");
-		return -EINVAL;
-	}
-
-	vid_mode_support = utils->read_bool(utils->data,
-				"qcom,mdss-dsi-video-mode");
-
-	cmd_mode_support = utils->read_bool(utils->data,
-				"qcom,mdss-dsi-cmd-mode");
-
-	if (cmd_mode_support)
-		mode->panel_mode = DSI_OP_CMD_MODE;
-	else if (vid_mode_support)
-		mode->panel_mode = DSI_OP_VIDEO_MODE;
-	else
-		return -EINVAL;
-
-	return 0;
-};
-
-
-static int dsi_panel_parse_dms_info(struct dsi_panel *panel)
-{
-	int dms_enabled;
-	const char *data;
-	struct dsi_parser_utils *utils = &panel->utils;
-
-	panel->dms_mode = DSI_DMS_MODE_DISABLED;
-	dms_enabled = utils->read_bool(utils->data,
-		"qcom,dynamic-mode-switch-enabled");
-	if (!dms_enabled)
-		return 0;
-
-	data = utils->get_property(utils->data,
-			"qcom,dynamic-mode-switch-type", NULL);
-	if (data && !strcmp(data, "dynamic-resolution-switch-immediate")) {
-		panel->dms_mode = DSI_DMS_MODE_RES_SWITCH_IMMEDIATE;
-	} else {
-		DSI_ERR("[%s] unsupported dynamic switch mode: %s\n",
-							panel->name, data);
-		return -EINVAL;
-	}
-
-	return 0;
-};
-
-/*
- * The length of all the valid values to be checked should not be greater
- * than the length of returned data from read command.
- */
-static bool
-dsi_panel_parse_esd_check_valid_params(struct dsi_panel *panel, u32 count)
-{
-	int i;
-	struct drm_panel_esd_config *config = &panel->esd_config;
-
-	for (i = 0; i < count; ++i) {
-		if (config->status_valid_params[i] >
-				config->status_cmds_rlen[i]) {
-			DSI_DEBUG("ignore valid params\n");
-			return false;
-		}
-	}
-
-	return true;
-}
-
-static bool dsi_panel_parse_esd_status_len(struct dsi_parser_utils *utils,
-	char *prop_key, u32 **target, u32 cmd_cnt)
-{
-	int tmp;
-
-	if (!utils->find_property(utils->data, prop_key, &tmp))
-		return false;
-
-	tmp /= sizeof(u32);
-	if (tmp != cmd_cnt) {
-		DSI_ERR("request property(%d) do not match cmd count(%d)\n",
-				tmp, cmd_cnt);
-		return false;
-	}
-
-	*target = kcalloc(tmp, sizeof(u32), GFP_KERNEL);
-	if (IS_ERR_OR_NULL(*target)) {
-		DSI_ERR("Error allocating memory for property\n");
-		return false;
-	}
-
-	if (utils->read_u32_array(utils->data, prop_key, *target, tmp)) {
-		DSI_ERR("cannot get values from dts\n");
-		kfree(*target);
-		*target = NULL;
-		return false;
-	}
-
-	return true;
-}
-
-static void dsi_panel_esd_config_deinit(struct drm_panel_esd_config *esd_config)
-{
-	kfree(esd_config->status_buf);
-	kfree(esd_config->return_buf);
-	kfree(esd_config->status_value);
-	kfree(esd_config->status_valid_params);
-	kfree(esd_config->status_cmds_rlen);
-	kfree(esd_config->status_cmd.cmds);
-}
-
-int dsi_panel_parse_esd_reg_read_configs(struct dsi_panel *panel)
-{
-	struct drm_panel_esd_config *esd_config;
-	int rc = 0;
-	u32 tmp;
-	u32 i, status_len, *lenp;
-	struct property *data;
-	struct dsi_parser_utils *utils = &panel->utils;
-
-	if (!panel) {
-		DSI_ERR("Invalid Params\n");
-		return -EINVAL;
-	}
-
-	esd_config = &panel->esd_config;
-	if (!esd_config)
-		return -EINVAL;
-
-	dsi_panel_parse_cmd_sets_sub(&esd_config->status_cmd,
-				DSI_CMD_SET_PANEL_STATUS, utils);
-	if (!esd_config->status_cmd.count) {
-		DSI_ERR("panel status command parsing failed\n");
-		rc = -EINVAL;
-		goto error;
-	}
-
-	if (!dsi_panel_parse_esd_status_len(utils,
-		"qcom,mdss-dsi-panel-status-read-length",
-			&panel->esd_config.status_cmds_rlen,
-				esd_config->status_cmd.count)) {
-		DSI_ERR("Invalid status read length\n");
-		rc = -EINVAL;
-		goto error1;
-	}
-
-	if (dsi_panel_parse_esd_status_len(utils,
-		"qcom,mdss-dsi-panel-status-valid-params",
-			&panel->esd_config.status_valid_params,
-				esd_config->status_cmd.count)) {
-		if (!dsi_panel_parse_esd_check_valid_params(panel,
-					esd_config->status_cmd.count)) {
-			rc = -EINVAL;
-			goto error2;
-		}
-	}
-
-	status_len = 0;
-	lenp = esd_config->status_valid_params ?: esd_config->status_cmds_rlen;
-	for (i = 0; i < esd_config->status_cmd.count; ++i)
-		status_len += lenp[i];
-
-	if (!status_len) {
-		rc = -EINVAL;
-		goto error2;
-	}
-
-	/*
-	 * Some panel may need multiple read commands to properly
-	 * check panel status. Do a sanity check for proper status
-	 * value which will be compared with the value read by dsi
-	 * controller during ESD check. Also check if multiple read
-	 * commands are there then, there should be corresponding
-	 * status check values for each read command.
-	 */
-	data = utils->find_property(utils->data,
-			"qcom,mdss-dsi-panel-status-value", &tmp);
-	tmp /= sizeof(u32);
-	if (!IS_ERR_OR_NULL(data) && tmp != 0 && (tmp % status_len) == 0) {
-		esd_config->groups = tmp / status_len;
-	} else {
-		DSI_ERR("error parse panel-status-value\n");
-		rc = -EINVAL;
-		goto error2;
-	}
-
-	esd_config->status_value =
-		kzalloc(sizeof(u32) * status_len * esd_config->groups,
-			GFP_KERNEL);
-	if (!esd_config->status_value) {
-		rc = -ENOMEM;
-		goto error2;
-	}
-
-	esd_config->return_buf = kcalloc(status_len * esd_config->groups,
-			sizeof(unsigned char), GFP_KERNEL);
-	if (!esd_config->return_buf) {
-		rc = -ENOMEM;
-		goto error3;
-	}
-
-	esd_config->status_buf = kzalloc(SZ_4K, GFP_KERNEL);
-	if (!esd_config->status_buf) {
-		rc = -ENOMEM;
-		goto error4;
-	}
-
-	rc = utils->read_u32_array(utils->data,
-		"qcom,mdss-dsi-panel-status-value",
-		esd_config->status_value, esd_config->groups * status_len);
-	if (rc) {
-		DSI_DEBUG("error reading panel status values\n");
-		memset(esd_config->status_value, 0,
-				esd_config->groups * status_len);
-	}
-
-	return 0;
-
-error4:
-	kfree(esd_config->return_buf);
-error3:
-	kfree(esd_config->status_value);
-error2:
-	kfree(esd_config->status_valid_params);
-	kfree(esd_config->status_cmds_rlen);
-error1:
-	kfree(esd_config->status_cmd.cmds);
-error:
-	return rc;
-}
-
-static int dsi_panel_parse_esd_config(struct dsi_panel *panel)
-{
-	int rc = 0;
-	const char *string;
-	struct drm_panel_esd_config *esd_config;
-	struct dsi_parser_utils *utils = &panel->utils;
-	u8 *esd_mode = NULL;
-
-	esd_config = &panel->esd_config;
-	esd_config->status_mode = ESD_MODE_MAX;
-	esd_config->esd_enabled = utils->read_bool(utils->data,
-		"qcom,esd-check-enabled");
-
-	if (!esd_config->esd_enabled)
-		return 0;
-
-	rc = utils->read_string(utils->data,
-			"qcom,mdss-dsi-panel-status-check-mode", &string);
-	if (!rc) {
-		if (!strcmp(string, "bta_check")) {
-			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")) {
-			if (panel->panel_mode == DSI_OP_CMD_MODE) {
-				esd_config->status_mode = ESD_MODE_PANEL_TE;
-			} else {
-				DSI_ERR("TE-ESD not valid for video mode\n");
-				rc = -EINVAL;
-				goto error;
-			}
-		} else {
-			DSI_ERR("No valid panel-status-check-mode string\n");
-			rc = -EINVAL;
-			goto error;
-		}
-	} else {
-		DSI_DEBUG("status check method not defined!\n");
-		rc = -EINVAL;
-		goto error;
-	}
-
-	if (panel->esd_config.status_mode == ESD_MODE_REG_READ) {
-		rc = dsi_panel_parse_esd_reg_read_configs(panel);
-		if (rc) {
-			DSI_ERR("failed to parse esd reg read mode params, rc=%d\n",
-						rc);
-			goto error;
-		}
-		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) {
-		esd_mode = "te_check";
-	}
-
-	DSI_DEBUG("ESD enabled with mode: %s\n", esd_mode);
-
-	return 0;
-
-error:
-	panel->esd_config.esd_enabled = false;
-	return rc;
-}
-
-static void dsi_panel_update_util(struct dsi_panel *panel,
-				  struct device_node *parser_node)
-{
-	struct dsi_parser_utils *utils = &panel->utils;
-
-	if (parser_node) {
-		*utils = *dsi_parser_get_parser_utils();
-		utils->data = parser_node;
-
-		DSI_DEBUG("switching to parser APIs\n");
-
-		goto end;
-	}
-
-	*utils = *dsi_parser_get_of_utils();
-	utils->data = panel->panel_of_node;
-end:
-	utils->node = panel->panel_of_node;
-}
-
-static int dsi_panel_vm_stub(struct dsi_panel *panel)
-{
-	return 0;
-}
-
-static void dsi_panel_setup_vm_ops(struct dsi_panel *panel, bool trusted_vm_env)
-{
-	if (trusted_vm_env) {
-		panel->panel_ops.pinctrl_init = dsi_panel_vm_stub;
-		panel->panel_ops.gpio_request = dsi_panel_vm_stub;
-		panel->panel_ops.pinctrl_deinit = dsi_panel_vm_stub;
-		panel->panel_ops.gpio_release = dsi_panel_vm_stub;
-		panel->panel_ops.bl_register = dsi_panel_vm_stub;
-		panel->panel_ops.bl_unregister = dsi_panel_vm_stub;
-		panel->panel_ops.parse_gpios = dsi_panel_vm_stub;
-	} else {
-		panel->panel_ops.pinctrl_init = dsi_panel_pinctrl_init;
-		panel->panel_ops.gpio_request = dsi_panel_gpio_request;
-		panel->panel_ops.pinctrl_deinit = dsi_panel_pinctrl_deinit;
-		panel->panel_ops.gpio_release = dsi_panel_gpio_release;
-		panel->panel_ops.bl_register = dsi_panel_bl_register;
-		panel->panel_ops.bl_unregister = dsi_panel_bl_unregister;
-		panel->panel_ops.parse_gpios = dsi_panel_parse_gpios;
-	}
-}
-
-struct dsi_panel *dsi_panel_get(struct device *parent,
-				struct device_node *of_node,
-				struct device_node *parser_node,
-				const char *type,
-				int topology_override,
-				bool trusted_vm_env)
-{
-	struct dsi_panel *panel;
-	struct dsi_parser_utils *utils;
-	const char *panel_physical_type;
-	int rc = 0;
-
-	panel = kzalloc(sizeof(*panel), GFP_KERNEL);
-	if (!panel)
-		return ERR_PTR(-ENOMEM);
-
-	dsi_panel_setup_vm_ops(panel, trusted_vm_env);
-
-	panel->panel_of_node = of_node;
-	panel->parent = parent;
-	panel->type = type;
-
-	dsi_panel_update_util(panel, parser_node);
-	utils = &panel->utils;
-
-	panel->name = utils->get_property(utils->data,
-				"qcom,mdss-dsi-panel-name", NULL);
-	if (!panel->name)
-		panel->name = DSI_PANEL_DEFAULT_LABEL;
-
-	/*
-	 * Set panel type to LCD as default.
-	 */
-	panel->panel_type = DSI_DISPLAY_PANEL_TYPE_LCD;
-	panel_physical_type = utils->get_property(utils->data,
-				"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_host_config(panel);
-	if (rc) {
-		DSI_ERR("failed to parse host configuration, rc=%d\n",
-				rc);
-		goto error;
-	}
-
-	rc = dsi_panel_parse_panel_mode(panel);
-	if (rc) {
-		DSI_ERR("failed to parse panel mode configuration, rc=%d\n",
-				rc);
-		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);
-
-	rc = dsi_panel_parse_qsync_caps(panel, of_node);
-	if (rc)
-		DSI_DEBUG("failed to parse qsync features, rc=%d\n", rc);
-
-	/* allow qsync support only if DFPS is with VFP approach */
-	if ((panel->dfps_caps.dfps_support) &&
-	    !(panel->dfps_caps.type == DSI_DFPS_IMMEDIATE_VFP))
-		panel->qsync_min_fps = 0;
-
-	rc = dsi_panel_parse_dyn_clk_caps(panel);
-	if (rc)
-		DSI_ERR("failed to parse dynamic clk config, rc=%d\n", rc);
-
-	rc = dsi_panel_parse_phy_props(panel);
-	if (rc) {
-		DSI_ERR("failed to parse panel physical dimension, rc=%d\n",
-				rc);
-		goto error;
-	}
-
-	rc = panel->panel_ops.parse_gpios(panel);
-	if (rc) {
-		DSI_ERR("failed to parse panel gpios, rc=%d\n", rc);
-		goto error;
-	}
-
-	rc = dsi_panel_parse_power_cfg(panel);
-	if (rc)
-		DSI_ERR("failed to parse power config, rc=%d\n", rc);
-
-	rc = dsi_panel_parse_bl_config(panel);
-	if (rc) {
-		DSI_ERR("failed to parse backlight config, rc=%d\n", rc);
-		if (rc == -EPROBE_DEFER)
-			goto error;
-	}
-
-	rc = dsi_panel_parse_misc_features(panel);
-	if (rc)
-		DSI_ERR("failed to parse misc features, rc=%d\n", rc);
-
-	rc = dsi_panel_parse_hdr_config(panel);
-	if (rc)
-		DSI_ERR("failed to parse hdr config, rc=%d\n", rc);
-
-	rc = dsi_panel_get_mode_count(panel);
-	if (rc) {
-		DSI_ERR("failed to get mode count, rc=%d\n", rc);
-		goto error;
-	}
-
-	rc = dsi_panel_parse_dms_info(panel);
-	if (rc)
-		DSI_DEBUG("failed to get dms info, rc=%d\n", rc);
-
-	rc = dsi_panel_parse_esd_config(panel);
-	if (rc)
-		DSI_DEBUG("failed to parse esd config, rc=%d\n", rc);
-
-	rc = dsi_panel_vreg_get(panel);
-	if (rc) {
-		DSI_ERR("[%s] failed to get panel regulators, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-
-	panel->power_mode = SDE_MODE_DPMS_OFF;
-	drm_panel_init(&panel->drm_panel);
-	panel->drm_panel.dev = &panel->mipi_device.dev;
-	panel->mipi_device.dev.of_node = of_node;
-
-	rc = drm_panel_add(&panel->drm_panel);
-	if (rc)
-		goto error_vreg_put;
-
-	mutex_init(&panel->panel_lock);
-
-	return panel;
-error_vreg_put:
-	(void)dsi_panel_vreg_put(panel);
-error:
-	kfree(panel);
-	return ERR_PTR(rc);
-}
-
-void dsi_panel_put(struct dsi_panel *panel)
-{
-	drm_panel_remove(&panel->drm_panel);
-
-	/* free resources allocated for ESD check */
-	dsi_panel_esd_config_deinit(&panel->esd_config);
-
-	kfree(panel);
-}
-
-int dsi_panel_drv_init(struct dsi_panel *panel,
-		       struct mipi_dsi_host *host)
-{
-	int rc = 0;
-	struct mipi_dsi_device *dev;
-
-	if (!panel || !host) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	dev = &panel->mipi_device;
-
-	dev->host = host;
-	/*
-	 * We dont have device structure since panel is not a device node.
-	 * When using drm panel framework, the device is probed when the host is
-	 * create.
-	 */
-	dev->channel = 0;
-	dev->lanes = 4;
-
-	panel->host = host;
-
-	rc = panel->panel_ops.pinctrl_init(panel);
-	if (rc) {
-		DSI_ERR("[%s] failed to init pinctrl, rc=%d\n",
-				panel->name, rc);
-		goto exit;
-	}
-
-	rc = panel->panel_ops.gpio_request(panel);
-	if (rc) {
-		DSI_ERR("[%s] failed to request gpios, rc=%d\n", panel->name,
-		       rc);
-		goto error_pinctrl_deinit;
-	}
-
-	rc = panel->panel_ops.bl_register(panel);
-	if (rc) {
-		if (rc != -EPROBE_DEFER)
-			DSI_ERR("[%s] failed to register backlight, rc=%d\n",
-			       panel->name, rc);
-		goto error_gpio_release;
-	}
-
-	goto exit;
-
-error_gpio_release:
-	(void)dsi_panel_gpio_release(panel);
-error_pinctrl_deinit:
-	(void)dsi_panel_pinctrl_deinit(panel);
-exit:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_drv_deinit(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = panel->panel_ops.bl_unregister(panel);
-	if (rc)
-		DSI_ERR("[%s] failed to unregister backlight, rc=%d\n",
-		       panel->name, rc);
-
-	rc = panel->panel_ops.gpio_release(panel);
-	if (rc)
-		DSI_ERR("[%s] failed to release gpios, rc=%d\n", panel->name,
-		       rc);
-
-	rc = panel->panel_ops.pinctrl_deinit(panel);
-	if (rc)
-		DSI_ERR("[%s] failed to deinit gpios, rc=%d\n", panel->name,
-		       rc);
-
-	rc = dsi_panel_vreg_put(panel);
-	if (rc)
-		DSI_ERR("[%s] failed to put regs, rc=%d\n", panel->name, rc);
-
-	panel->host = NULL;
-	memset(&panel->mipi_device, 0x0, sizeof(panel->mipi_device));
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_validate_mode(struct dsi_panel *panel,
-			    struct dsi_display_mode *mode)
-{
-	return 0;
-}
-
-static int dsi_panel_get_max_res_count(struct dsi_parser_utils *utils,
-	struct device_node *node, u32 *dsc_count, u32 *lm_count)
-{
-	const char *compression;
-	u32 *array = NULL, top_count, len, i;
-	int rc = -EINVAL;
-	bool dsc_enable = false;
-
-	*dsc_count = 0;
-	*lm_count = 0;
-	compression = utils->get_property(node, "qcom,compression-mode", NULL);
-	if (compression && !strcmp(compression, "dsc"))
-		dsc_enable = true;
-
-	len = utils->count_u32_elems(node, "qcom,display-topology");
-	if (len <= 0 || len % TOPOLOGY_SET_LEN ||
-			len > (TOPOLOGY_SET_LEN * MAX_TOPOLOGY))
-		return rc;
-
-	top_count = len / TOPOLOGY_SET_LEN;
-
-	array = kcalloc(len, sizeof(u32), GFP_KERNEL);
-	if (!array)
-		return -ENOMEM;
-
-	rc = utils->read_u32_array(node, "qcom,display-topology", array, len);
-	if (rc) {
-		DSI_ERR("unable to read the display topologies, rc = %d\n", rc);
-		goto read_fail;
-	}
-
-	for (i = 0; i < top_count; i++) {
-		*lm_count = max(*lm_count, array[i * TOPOLOGY_SET_LEN]);
-		if (dsc_enable)
-			*dsc_count = max(*dsc_count,
-					array[i * TOPOLOGY_SET_LEN + 1]);
-	}
-
-read_fail:
-	kfree(array);
-	return 0;
-}
-
-int dsi_panel_get_mode_count(struct dsi_panel *panel)
-{
-	const u32 SINGLE_MODE_SUPPORT = 1;
-	struct dsi_parser_utils *utils;
-	struct device_node *timings_np, *child_np;
-	int num_dfps_rates, num_bit_clks;
-	int num_video_modes = 0, num_cmd_modes = 0;
-	int count, rc = 0;
-	u32 dsc_count = 0, lm_count = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	utils = &panel->utils;
-
-	panel->num_timing_nodes = 0;
-
-	timings_np = utils->get_child_by_name(utils->data,
-			"qcom,mdss-dsi-display-timings");
-	if (!timings_np && !panel->host_config.ext_bridge_mode) {
-		DSI_ERR("no display timing nodes defined\n");
-		rc = -EINVAL;
-		goto error;
-	}
-
-	count = utils->get_child_count(timings_np);
-	if ((!count && !panel->host_config.ext_bridge_mode) ||
-		count > DSI_MODE_MAX) {
-		DSI_ERR("invalid count of timing nodes: %d\n", count);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	/* No multiresolution support is available for video mode panels.
-	 * Multi-mode is supported for video mode during POMS is enabled.
-	 */
-	if (panel->panel_mode != DSI_OP_CMD_MODE &&
-		!panel->host_config.ext_bridge_mode &&
-		!panel->panel_mode_switch_enabled)
-		count = SINGLE_MODE_SUPPORT;
-
-	panel->num_timing_nodes = count;
-	dsi_for_each_child_node(timings_np, child_np) {
-		if (utils->read_bool(child_np, "qcom,mdss-dsi-video-mode"))
-			num_video_modes++;
-		else if (utils->read_bool(child_np,
-					"qcom,mdss-dsi-cmd-mode"))
-			num_cmd_modes++;
-		else if (panel->panel_mode == DSI_OP_VIDEO_MODE)
-			num_video_modes++;
-		else if (panel->panel_mode == DSI_OP_CMD_MODE)
-			num_cmd_modes++;
-
-		dsi_panel_get_max_res_count(utils, child_np,
-				&dsc_count, &lm_count);
-		panel->dsc_count = max(dsc_count, panel->dsc_count);
-		panel->lm_count = max(lm_count, panel->lm_count);
-	}
-
-	num_dfps_rates = !panel->dfps_caps.dfps_support ? 1 :
-					panel->dfps_caps.dfps_list_len;
-
-	num_bit_clks = !panel->dyn_clk_caps.dyn_clk_support ? 1 :
-					panel->dyn_clk_caps.bit_clk_list_len;
-
-	/*
-	 * Inflate num_of_modes by fps and bit clks in dfps.
-	 * Single command mode for video mode panels supporting
-	 * panel operating mode switch.
-	 */
-	num_video_modes = num_video_modes * num_bit_clks * num_dfps_rates;
-
-	if ((panel->panel_mode == DSI_OP_VIDEO_MODE) &&
-			(panel->panel_mode_switch_enabled))
-		num_cmd_modes  = 1;
-	else
-		num_cmd_modes = num_cmd_modes * num_bit_clks;
-
-	panel->num_display_modes = num_video_modes + num_cmd_modes;
-
-error:
-	return rc;
-}
-
-int dsi_panel_get_phy_props(struct dsi_panel *panel,
-			    struct dsi_panel_phy_props *phy_props)
-{
-	int rc = 0;
-
-	if (!panel || !phy_props) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	memcpy(phy_props, &panel->phy_props, sizeof(*phy_props));
-	return rc;
-}
-
-int dsi_panel_get_dfps_caps(struct dsi_panel *panel,
-			    struct dsi_dfps_capabilities *dfps_caps)
-{
-	int rc = 0;
-
-	if (!panel || !dfps_caps) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	memcpy(dfps_caps, &panel->dfps_caps, sizeof(*dfps_caps));
-	return rc;
-}
-
-void dsi_panel_put_mode(struct dsi_display_mode *mode)
-{
-	int i;
-
-	if (!mode->priv_info)
-		return;
-
-	for (i = 0; i < DSI_CMD_SET_MAX; i++) {
-		dsi_panel_destroy_cmd_packets(&mode->priv_info->cmd_sets[i]);
-		dsi_panel_dealloc_cmd_packets(&mode->priv_info->cmd_sets[i]);
-	}
-
-	kfree(mode->priv_info);
-}
-
-void dsi_panel_calc_dsi_transfer_time(struct dsi_host_common_cfg *config,
-		struct dsi_display_mode *mode, u32 frame_threshold_us)
-{
-	u32 frame_time_us, nslices;
-	u64 min_bitclk_hz, total_active_pixels, bits_per_line, pclk_rate_hz,
-		dsi_transfer_time_us, pixel_clk_khz;
-	struct msm_display_dsc_info *dsc = mode->timing.dsc;
-	struct dsi_mode_info *timing = &mode->timing;
-	struct dsi_display_mode *display_mode;
-	u32 jitter_numer, jitter_denom, prefill_lines;
-	u32 min_threshold_us, prefill_time_us, max_transfer_us;
-	u16 bpp;
-
-	/* Packet overlead in bits,2 bytes header + 2 bytes checksum
-	 * + 1 byte dcs data command.
-	*/
-	const u32 packet_overhead = 56;
-
-	display_mode = container_of(timing, struct dsi_display_mode, timing);
-
-	jitter_numer = display_mode->priv_info->panel_jitter_numer;
-	jitter_denom = display_mode->priv_info->panel_jitter_denom;
-
-	frame_time_us = mult_frac(1000, 1000, (timing->refresh_rate));
-
-	if (timing->refresh_rate >= 120)
-		frame_threshold_us = HIGH_REFRESH_RATE_THRESHOLD_TIME_US;
-
-	if (timing->dsc_enabled) {
-		nslices = (timing->h_active)/(dsc->config.slice_width);
-		/* (slice width x bit-per-pixel + packet overhead) x
-		 * number of slices x height x fps / lane
-		 */
-		bpp = DSC_BPP(dsc->config);
-		bits_per_line = ((dsc->config.slice_width * bpp) +
-				packet_overhead) * nslices;
-		bits_per_line = bits_per_line / (config->num_data_lanes);
-
-		min_bitclk_hz = (bits_per_line * timing->v_active *
-					timing->refresh_rate);
-	} else {
-		total_active_pixels = ((dsi_h_active_dce(timing)
-					* timing->v_active));
-		/* calculate the actual bitclk needed to transfer the frame */
-		min_bitclk_hz = (total_active_pixels * (timing->refresh_rate) *
-				(config->bpp));
-		do_div(min_bitclk_hz, config->num_data_lanes);
-	}
-
-	timing->min_dsi_clk_hz = min_bitclk_hz;
-
-	min_threshold_us = mult_frac(frame_time_us,
-			jitter_numer, (jitter_denom * 100));
-	/*
-	 * Increase the prefill_lines proportionately as recommended
-	 * 35lines for 60fps, 52 for 90fps, 70lines for 120fps.
-	 */
-	prefill_lines = mult_frac(MIN_PREFILL_LINES,
-			timing->refresh_rate, 60);
-
-	prefill_time_us = mult_frac(frame_time_us, prefill_lines,
-			(timing->v_active));
-
-	/*
-	 * Threshold is sum of panel jitter time, prefill line time
-	 * plus 64usec buffer time.
-	 */
-	min_threshold_us = min_threshold_us + 64 + prefill_time_us;
-
-	DSI_DEBUG("min threshold time=%d\n", min_threshold_us);
-
-	if (timing->clk_rate_hz) {
-		/* adjust the transfer time proportionately for bit clk*/
-		dsi_transfer_time_us = frame_time_us * min_bitclk_hz;
-		do_div(dsi_transfer_time_us, timing->clk_rate_hz);
-		timing->dsi_transfer_time_us = dsi_transfer_time_us;
-
-	} else if (mode->priv_info->mdp_transfer_time_us) {
-		max_transfer_us = frame_time_us - min_threshold_us;
-		mode->priv_info->mdp_transfer_time_us = min(
-				mode->priv_info->mdp_transfer_time_us,
-				max_transfer_us);
-		timing->dsi_transfer_time_us =
-			mode->priv_info->mdp_transfer_time_us;
-	} else {
-		if (min_threshold_us > frame_threshold_us)
-			frame_threshold_us = min_threshold_us;
-
-		timing->dsi_transfer_time_us = frame_time_us -
-			frame_threshold_us;
-	}
-
-	timing->mdp_transfer_time_us = timing->dsi_transfer_time_us;
-
-	/* Force update mdp xfer time to hal,if clk and mdp xfer time is set */
-	if (mode->priv_info->mdp_transfer_time_us && timing->clk_rate_hz) {
-		timing->mdp_transfer_time_us =
-			mode->priv_info->mdp_transfer_time_us;
-	}
-
-	/* Calculate pclk_khz to update modeinfo */
-	pclk_rate_hz =  min_bitclk_hz * frame_time_us;
-	do_div(pclk_rate_hz, timing->dsi_transfer_time_us);
-
-	pixel_clk_khz = pclk_rate_hz * config->num_data_lanes;
-	do_div(pixel_clk_khz, config->bpp);
-	display_mode->pixel_clk_khz = pixel_clk_khz;
-
-	display_mode->pixel_clk_khz =  display_mode->pixel_clk_khz / 1000;
-}
-
-
-int dsi_panel_get_mode(struct dsi_panel *panel,
-			u32 index, struct dsi_display_mode *mode,
-			int topology_override)
-{
-	struct device_node *timings_np, *child_np;
-	struct dsi_parser_utils *utils;
-	struct dsi_display_mode_priv_info *prv_info;
-	u32 child_idx = 0;
-	int rc = 0, num_timings;
-	int traffic_mode;
-	int panel_mode;
-	void *utils_data = NULL;
-
-	if (!panel || !mode) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-	utils = &panel->utils;
-
-	mode->priv_info = kzalloc(sizeof(*mode->priv_info), GFP_KERNEL);
-	if (!mode->priv_info) {
-		rc = -ENOMEM;
-		goto done;
-	}
-
-	prv_info = mode->priv_info;
-
-	timings_np = utils->get_child_by_name(utils->data,
-		"qcom,mdss-dsi-display-timings");
-	if (!timings_np) {
-		DSI_ERR("no display timing nodes defined\n");
-		rc = -EINVAL;
-		goto parse_fail;
-	}
-
-	num_timings = utils->get_child_count(timings_np);
-	if (!num_timings || num_timings > DSI_MODE_MAX) {
-		DSI_ERR("invalid count of timing nodes: %d\n", num_timings);
-		rc = -EINVAL;
-		goto parse_fail;
-	}
-
-	utils_data = utils->data;
-	traffic_mode = panel->video_config.traffic_mode;
-	panel_mode = panel->panel_mode;
-
-	dsi_for_each_child_node(timings_np, child_np) {
-		if (index != child_idx++)
-			continue;
-
-		utils->data = child_np;
-
-		rc = dsi_panel_parse_timing(&mode->timing, utils);
-		if (rc) {
-			DSI_ERR("failed to parse panel timing, rc=%d\n", rc);
-			goto parse_fail;
-		}
-
-		rc = dsi_panel_parse_dsc_params(mode, utils);
-		if (rc) {
-			DSI_ERR("failed to parse dsc params, rc=%d\n", rc);
-			goto parse_fail;
-		}
-
-		rc = dsi_panel_parse_vdc_params(mode, utils, traffic_mode,
-			panel_mode);
-		if (rc) {
-			DSI_ERR("failed to parse vdc params, rc=%d\n", rc);
-			goto parse_fail;
-		}
-
-		rc = dsi_panel_parse_topology(prv_info, utils,
-				topology_override);
-		if (rc) {
-			DSI_ERR("failed to parse panel topology, rc=%d\n", rc);
-			goto parse_fail;
-		}
-
-		rc = dsi_panel_parse_cmd_sets(prv_info, utils);
-		if (rc) {
-			DSI_ERR("failed to parse command sets, rc=%d\n", rc);
-			goto parse_fail;
-		}
-
-		rc = dsi_panel_parse_jitter_config(mode, utils);
-		if (rc)
-			DSI_ERR(
-			"failed to parse panel jitter config, rc=%d\n", rc);
-
-		rc = dsi_panel_parse_phy_timing(mode, utils);
-		if (rc) {
-			DSI_ERR(
-			"failed to parse panel phy timings, rc=%d\n", rc);
-			goto parse_fail;
-		}
-
-		rc = dsi_panel_parse_partial_update_caps(mode, utils);
-		if (rc)
-			DSI_ERR("failed to partial update caps, rc=%d\n", rc);
-
-		if (panel->panel_mode_switch_enabled) {
-			rc = dsi_panel_parse_panel_mode_caps(mode, utils);
-			if (rc) {
-				rc = 0;
-				mode->panel_mode = panel->panel_mode;
-				DSI_INFO(
-				"POMS: panel mode isn't specified in timing[%d]\n",
-				child_idx);
-			}
-		} else {
-			mode->panel_mode = panel->panel_mode;
-		}
-	}
-	goto done;
-
-parse_fail:
-	kfree(mode->priv_info);
-	mode->priv_info = NULL;
-done:
-	utils->data = utils_data;
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_get_host_cfg_for_mode(struct dsi_panel *panel,
-				    struct dsi_display_mode *mode,
-				    struct dsi_host_config *config)
-{
-	int rc = 0;
-	struct dsi_dyn_clk_caps *dyn_clk_caps = &panel->dyn_clk_caps;
-
-	if (!panel || !mode || !config) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	config->panel_mode = panel->panel_mode;
-	memcpy(&config->common_config, &panel->host_config,
-	       sizeof(config->common_config));
-
-	if (panel->panel_mode == DSI_OP_VIDEO_MODE) {
-		memcpy(&config->u.video_engine, &panel->video_config,
-		       sizeof(config->u.video_engine));
-	} else {
-		memcpy(&config->u.cmd_engine, &panel->cmd_config,
-		       sizeof(config->u.cmd_engine));
-	}
-
-	memcpy(&config->video_timing, &mode->timing,
-	       sizeof(config->video_timing));
-	config->video_timing.mdp_transfer_time_us =
-			mode->priv_info->mdp_transfer_time_us;
-	config->video_timing.dsc_enabled = mode->priv_info->dsc_enabled;
-	config->video_timing.dsc = &mode->priv_info->dsc;
-
-	config->video_timing.vdc_enabled = mode->priv_info->vdc_enabled;
-	config->video_timing.vdc = &mode->priv_info->vdc;
-
-	if (dyn_clk_caps->dyn_clk_support)
-		config->bit_clk_rate_hz_override = mode->timing.clk_rate_hz;
-	else
-		config->bit_clk_rate_hz_override = mode->priv_info->clk_rate_hz;
-
-	config->esc_clk_rate_hz = 19200000;
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_pre_prepare(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	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;
-	}
-
-error:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_update_pps(struct dsi_panel *panel)
-{
-	int rc = 0;
-	struct dsi_panel_cmd_set *set = NULL;
-	struct dsi_display_mode_priv_info *priv_info = NULL;
-
-	if (!panel || !panel->cur_mode) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	priv_info = panel->cur_mode->priv_info;
-
-	set = &priv_info->cmd_sets[DSI_CMD_SET_PPS];
-
-	if (priv_info->dsc_enabled)
-		dsi_dsc_create_pps_buf_cmd(&priv_info->dsc,
-				panel->dce_pps_cmd, 0,
-				DSI_CMD_PPS_SIZE - DSI_CMD_PPS_HDR_SIZE);
-	else if (priv_info->vdc_enabled)
-		dsi_vdc_create_pps_buf_cmd(&priv_info->vdc,
-				panel->dce_pps_cmd, 0,
-				DSI_CMD_PPS_SIZE - DSI_CMD_PPS_HDR_SIZE);
-
-	if (priv_info->dsc_enabled || priv_info->vdc_enabled) {
-		rc = dsi_panel_create_cmd_packets(panel->dce_pps_cmd,
-				DSI_CMD_PPS_SIZE, 1, set->cmds);
-		if (rc) {
-			DSI_ERR("failed to create cmd packets, rc=%d\n", rc);
-			goto error;
-		}
-	}
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_PPS);
-	if (rc) {
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_PPS cmds, rc=%d\n",
-			panel->name, rc);
-	}
-
-	dsi_panel_destroy_cmd_packets(set);
-error:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_set_lp1(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-	if (!panel->panel_initialized)
-		goto exit;
-
-	/*
-	 * Consider LP1->LP2->LP1.
-	 * If the panel is already in LP mode, do not need to
-	 * set the regulator.
-	 * IBB and AB power mode would be set at the same time
-	 * in PMIC driver, so we only call ibb setting that is enough.
-	 */
-	if (dsi_panel_is_type_oled(panel) &&
-		panel->power_mode != SDE_MODE_DPMS_LP2)
-		dsi_pwr_panel_regulator_mode_set(&panel->power_info,
-			"ibb", REGULATOR_MODE_IDLE);
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_LP1);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_LP1 cmd, rc=%d\n",
-		       panel->name, rc);
-exit:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_set_lp2(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-	if (!panel->panel_initialized)
-		goto exit;
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_LP2);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_LP2 cmd, rc=%d\n",
-		       panel->name, rc);
-exit:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_set_nolp(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-	if (!panel->panel_initialized)
-		goto exit;
-
-	/*
-	 * Consider about LP1->LP2->NOLP.
-	 */
-	if (dsi_panel_is_type_oled(panel) &&
-	    (panel->power_mode == SDE_MODE_DPMS_LP1 ||
-	     panel->power_mode == SDE_MODE_DPMS_LP2))
-		dsi_pwr_panel_regulator_mode_set(&panel->power_info,
-			"ibb", REGULATOR_MODE_NORMAL);
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_NOLP);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_NOLP cmd, rc=%d\n",
-		       panel->name, rc);
-exit:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_prepare(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	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;
-		}
-	}
-
-	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;
-	}
-
-error:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-static int dsi_panel_roi_prepare_dcs_cmds(struct dsi_panel_cmd_set *set,
-		struct dsi_rect *roi, int ctrl_idx, int unicast)
-{
-	static const int ROI_CMD_LEN = 5;
-
-	int rc = 0;
-
-	/* DTYPE_DCS_LWRITE */
-	char *caset, *paset;
-
-	set->cmds = NULL;
-
-	caset = kzalloc(ROI_CMD_LEN, GFP_KERNEL);
-	if (!caset) {
-		rc = -ENOMEM;
-		goto exit;
-	}
-	caset[0] = 0x2a;
-	caset[1] = (roi->x & 0xFF00) >> 8;
-	caset[2] = roi->x & 0xFF;
-	caset[3] = ((roi->x - 1 + roi->w) & 0xFF00) >> 8;
-	caset[4] = (roi->x - 1 + roi->w) & 0xFF;
-
-	paset = kzalloc(ROI_CMD_LEN, GFP_KERNEL);
-	if (!paset) {
-		rc = -ENOMEM;
-		goto error_free_mem;
-	}
-	paset[0] = 0x2b;
-	paset[1] = (roi->y & 0xFF00) >> 8;
-	paset[2] = roi->y & 0xFF;
-	paset[3] = ((roi->y - 1 + roi->h) & 0xFF00) >> 8;
-	paset[4] = (roi->y - 1 + roi->h) & 0xFF;
-
-	set->type = DSI_CMD_SET_ROI;
-	set->state = DSI_CMD_SET_STATE_LP;
-	set->count = 2; /* send caset + paset together */
-	set->cmds = kcalloc(set->count, sizeof(*set->cmds), GFP_KERNEL);
-	if (!set->cmds) {
-		rc = -ENOMEM;
-		goto error_free_mem;
-	}
-	set->cmds[0].msg.channel = 0;
-	set->cmds[0].msg.type = MIPI_DSI_DCS_LONG_WRITE;
-	set->cmds[0].msg.flags = unicast ? MIPI_DSI_MSG_UNICAST : 0;
-	set->cmds[0].msg.ctrl = unicast ? ctrl_idx : 0;
-	set->cmds[0].msg.tx_len = ROI_CMD_LEN;
-	set->cmds[0].msg.tx_buf = caset;
-	set->cmds[0].msg.rx_len = 0;
-	set->cmds[0].msg.rx_buf = 0;
-	set->cmds[0].msg.wait_ms = 0;
-	set->cmds[0].last_command = 0;
-	set->cmds[0].post_wait_ms = 0;
-
-	set->cmds[1].msg.channel = 0;
-	set->cmds[1].msg.type = MIPI_DSI_DCS_LONG_WRITE;
-	set->cmds[1].msg.flags = unicast ? MIPI_DSI_MSG_UNICAST : 0;
-	set->cmds[1].msg.ctrl = unicast ? ctrl_idx : 0;
-	set->cmds[1].msg.tx_len = ROI_CMD_LEN;
-	set->cmds[1].msg.tx_buf = paset;
-	set->cmds[1].msg.rx_len = 0;
-	set->cmds[1].msg.rx_buf = 0;
-	set->cmds[1].msg.wait_ms = 0;
-	set->cmds[1].last_command = 1;
-	set->cmds[1].post_wait_ms = 0;
-
-	goto exit;
-
-error_free_mem:
-	kfree(caset);
-	kfree(paset);
-	kfree(set->cmds);
-
-exit:
-	return rc;
-}
-
-int dsi_panel_send_qsync_on_dcs(struct dsi_panel *panel,
-		int ctrl_idx)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	DSI_DEBUG("ctrl:%d qsync on\n", ctrl_idx);
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_QSYNC_ON);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_QSYNC_ON cmds rc=%d\n",
-		       panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_send_qsync_off_dcs(struct dsi_panel *panel,
-		int ctrl_idx)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	DSI_DEBUG("ctrl:%d qsync off\n", ctrl_idx);
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_QSYNC_OFF);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_QSYNC_OFF cmds rc=%d\n",
-		       panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_send_roi_dcs(struct dsi_panel *panel, int ctrl_idx,
-		struct dsi_rect *roi)
-{
-	int rc = 0;
-	struct dsi_panel_cmd_set *set;
-	struct dsi_display_mode_priv_info *priv_info;
-
-	if (!panel || !panel->cur_mode) {
-		DSI_ERR("Invalid params\n");
-		return -EINVAL;
-	}
-
-	priv_info = panel->cur_mode->priv_info;
-	set = &priv_info->cmd_sets[DSI_CMD_SET_ROI];
-
-	rc = dsi_panel_roi_prepare_dcs_cmds(set, roi, ctrl_idx, true);
-	if (rc) {
-		DSI_ERR("[%s] failed to prepare DSI_CMD_SET_ROI cmds, rc=%d\n",
-				panel->name, rc);
-		return rc;
-	}
-	DSI_DEBUG("[%s] send roi x %d y %d w %d h %d\n", panel->name,
-			roi->x, roi->y, roi->w, roi->h);
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_ROI);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_ROI cmds, rc=%d\n",
-				panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-
-	dsi_panel_destroy_cmd_packets(set);
-	dsi_panel_dealloc_cmd_packets(set);
-
-	return rc;
-}
-
-int dsi_panel_pre_mode_switch_to_video(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("Invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_CMD_TO_VID_SWITCH);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_CMD_TO_VID_SWITCH cmds, rc=%d\n",
-		       panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_pre_mode_switch_to_cmd(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("Invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_VID_TO_CMD_SWITCH);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_CMD_TO_VID_SWITCH cmds, rc=%d\n",
-		       panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_mode_switch_to_cmd(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("Invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_VID_TO_CMD_SWITCH);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_CMD_TO_VID_SWITCH cmds, rc=%d\n",
-		       panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_mode_switch_to_vid(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("Invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_CMD_TO_VID_SWITCH);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_CMD_TO_VID_SWITCH cmds, rc=%d\n",
-		       panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_switch(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("Invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_TIMING_SWITCH);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_TIMING_SWITCH cmds, rc=%d\n",
-		       panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_post_switch(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("Invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_TIMING_SWITCH);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_POST_TIMING_SWITCH cmds, rc=%d\n",
-		       panel->name, rc);
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_enable(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("Invalid params\n");
-		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);
-	if (rc)
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_ON cmds, rc=%d\n",
-		       panel->name, rc);
-	else
-		panel->panel_initialized = true;
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_post_enable(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_ON);
-	if (rc) {
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_POST_ON cmds, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-error:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_pre_disable(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	if (gpio_is_valid(panel->bl_config.en_gpio))
-		gpio_set_value(panel->bl_config.en_gpio, 0);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_PRE_OFF);
-	if (rc) {
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_PRE_OFF cmds, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-
-error:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_disable(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		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 */
-	if (!atomic_read(&panel->esd_recovery_pending)) {
-		/*
-		 * Need to set IBB/AB regulator mode to STANDBY,
-		 * if panel is going off from AOD mode.
-		 */
-		if (dsi_panel_is_type_oled(panel) &&
-			(panel->power_mode == SDE_MODE_DPMS_LP1 ||
-			panel->power_mode == SDE_MODE_DPMS_LP2))
-			dsi_pwr_panel_regulator_mode_set(&panel->power_info,
-				"ibb", REGULATOR_MODE_STANDBY);
-		rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_OFF);
-		if (rc) {
-			/*
-			 * Sending panel off commands may fail when  DSI
-			 * controller is in a bad state. These failures can be
-			 * ignored since controller will go for full reset on
-			 * subsequent display enable anyway.
-			 */
-			pr_warn_ratelimited("[%s] failed to send DSI_CMD_SET_OFF cmds, rc=%d\n",
-					panel->name, rc);
-			rc = 0;
-		}
-	}
-	panel->panel_initialized = false;
-	panel->power_mode = SDE_MODE_DPMS_OFF;
-
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_unprepare(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_tx_cmd_set(panel, DSI_CMD_SET_POST_OFF);
-	if (rc) {
-		DSI_ERR("[%s] failed to send DSI_CMD_SET_POST_OFF cmds, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-
-error:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}
-
-int dsi_panel_post_unprepare(struct dsi_panel *panel)
-{
-	int rc = 0;
-
-	if (!panel) {
-		DSI_ERR("invalid params\n");
-		return -EINVAL;
-	}
-
-	mutex_lock(&panel->panel_lock);
-
-	rc = dsi_panel_power_off(panel);
-	if (rc) {
-		DSI_ERR("[%s] panel power_Off failed, rc=%d\n",
-		       panel->name, rc);
-		goto error;
-	}
-error:
-	mutex_unlock(&panel->panel_lock);
-	return rc;
-}

From b6d3acff9c04d7d0d39f42ee222f53265a6b5555 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Thu, 22 Oct 2020 15:21:46 +0800
Subject: [PATCH 057/116] fixup! (CR): disp: msm:: reset the param value to the
 default value

This code is pick from the project with Android-p,
But there is a code error when make propagation from the previous project.
We must reset the param after panel enabled every time.

Mot-CRs-fixed: (CR)

Signed-off-by: houdz1 <houdz1@motorola.com>
Change-Id: I164c5bd1dcb89bfcf07627eb2455db0fc9d184b6
Reviewed-on: https://gerrit.mot.com/1782141
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
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
---
 msm/dsi/dsi_display.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 7e735115955d..e216d32d3e24 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8978,7 +8978,7 @@ int dsi_display_enable(struct dsi_display *display)
 			       display->name, rc);
 			goto error;
 		}
-
+		dsi_panel_reset_param(display->panel);
 		dsi_display_enable_status(display, true);
 	}
 	dsi_display_panel_id_notification(display);
@@ -8992,7 +8992,6 @@ 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) {

From e65d196c2a0ecad2351f422b7f3ce5785f11945e Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Thu, 22 Oct 2020 16:56:08 +0800
Subject: [PATCH 058/116] Display PanelMode: Add CABC control

Add CABC control interface for video mode panel. This interface is
also used by sde connector property.
port of : 09a47b9fa

Change-Id: Id3170799333bc7852c1b92895bd016fda13d580c
Reviewed-on: https://gerrit.mot.com/1782225
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
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
---
 msm/dsi/dsi_defs.h      |  9 ++++++++-
 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   |  3 +++
 6 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 870b7c5b5f41..6c78879913a6 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -267,7 +267,11 @@ 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_HBM_DIM_OFF:		   Turning HBM DIM off
+ * @DSI_CMD_SET_HBM_DIM_OFF:		       Turning HBM DIM 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 {
@@ -300,6 +304,9 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_ACL_ON,
 	DSI_CMD_SET_ACL_OFF,
 	DSI_CMD_SET_HBM_DIM_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 cccfc795887f..9f18d06f060b 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -68,10 +68,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}
 	},
@@ -864,7 +872,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);
 
@@ -950,6 +958,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)
 {
@@ -966,6 +987,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;
@@ -2100,6 +2124,9 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-acl-on-command",
 	"qcom,mdss-dsi-acl-off-command",
 	"qcom,mdss-dsi-hbm-dim-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] = {
@@ -2132,6 +2159,9 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-acl-on-command-state",
 	"qcom,mdss-dsi-acl-off-command-state",
 	"qcom,mdss-dsi-hbm-dim-off-command-state",
+	"qcom,mdss-dsi-cabc-ui-command-state",
+	"qcom,mdss-dsi-cabc-mv-command-state",
+	"qcom,mdss-dsi-cabc-dis-command-state",
 };
 
 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 4f286f7fa750..c346d703a03f 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -236,6 +236,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 9b7520718baf..b69a2c7cec5a 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -218,6 +218,7 @@ enum msm_mdp_conn_property {
 
 	/* MOT feature panel*/
 	CONNECTOR_PROP_HBM,
+	CONNECTOR_PROP_CABC,
 	CONNECTOR_PROP_ACL,
 	/* total # of properties */
 	CONNECTOR_PROP_COUNT
@@ -365,6 +366,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 bc40cc07172e..09b77f4bed32 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1578,6 +1578,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;
 	}
@@ -2674,6 +2682,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 d0b98d644327..84ff35b4caee 100644
--- a/msm/sde/sde_motUtil.c
+++ b/msm/sde/sde_motUtil.c
@@ -217,6 +217,9 @@ static int _sde_debugfs_motUtil_kms_prop_test(struct sde_kms *kms,
 		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 3b2c72bc4ab6df83a9ac825302170b9261461ea7 Mon Sep 17 00:00:00 2001
From: daiss1 <daiss1@lenovo.com>
Date: Fri, 6 Mar 2020 17:52:09 +0800
Subject: [PATCH 059/116] msm/dsi: add  hbm debug log

Modify:
add backlight and hbm debug log

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

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 9f18d06f060b..e7db86c33b35 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -741,10 +741,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;

From 1fd102ea73e94640b664aaaf4e257225cb152434 Mon Sep 17 00:00:00 2001
From: shuoyan <shuoyan@motorola.com>
Date: Fri, 28 Feb 2020 10:50:21 -0600
Subject: [PATCH 060/116] disp: msm: prevent ESD recovery till all panel dead

PROPAGATED from (CR)

Device reboot when CLI panel dead
Quality team hopes Device still alive when one panel dead.

Modify the ESD recovery policy that reboot all when all
display dead.

Change-Id: I78ca19de9723c00416ea43457b6750b7a765c08f
Reviewed-on: https://gerrit.mot.com/1782924
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 21 +++++++++++++++++++++
 msm/dsi/dsi_panel.c   | 27 +++++++++++++++++----------
 msm/dsi/dsi_panel.h   |  5 +++++
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index e216d32d3e24..f1f7e23071dc 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6611,6 +6611,27 @@ int dsi_display_get_num_of_displays(void)
 	return count;
 }
 
+bool dsi_display_all_displays_dead(void)
+{
+	int index =0, num_displays =0, num_dead_displays =0;
+
+	for (index = 0; index < MAX_DSI_ACTIVE_DISPLAY; index++) {
+		struct dsi_display *display = boot_displays[index].disp;
+
+		if (display && display->panel_node) {
+			num_displays++;
+
+			if (display->panel->is_panel_dead)
+				num_dead_displays++;
+		}
+	}
+
+	pr_info("%d Display Dead(%d)\n", num_dead_displays, num_displays);
+
+	return num_dead_displays == num_displays;
+}
+EXPORT_SYMBOL(dsi_display_all_displays_dead);
+
 int dsi_display_get_active_displays(void **display_array, u32 max_display_count)
 {
 	int index = 0, count = 0;
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index e7db86c33b35..052ca33d7f93 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -5462,9 +5462,7 @@ int dsi_panel_enable(struct dsi_panel *panel)
 {
 	int rc = 0;
 	u8 pwr_mode;
-	static int panel_recovery_retry;
-	struct dsi_display *dsi_display = container_of(panel->host,
-										struct dsi_display, host);
+  	struct dsi_display *dsi_display = container_of(panel->host, struct dsi_display, host);
 
 	if (!panel) {
 		DSI_ERR("Invalid params\n");
@@ -5490,20 +5488,29 @@ 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_ERR("%s: %s Read Pwr_mode=0%x is not matched with expected value =0x%x\n",
+				__func__, panel->name, pwr_mode, panel->disp_on_chk_val);
 
-			if (panel_recovery_retry++ > 5) {
+			if (panel->panel_recovery_retry++ > 5) {
 				DSI_ERR("%s: panel recovery failed for all retries",
 					__func__);
 
-				BUG();
-			}
+				panel->is_panel_dead = true;
+				panel->esd_utag_enable = false;
+				panel->no_panel_on_read_support = true;
 
-			dsi_display_trigger_panel_dead_event(dsi_display);
+				if (dsi_display_all_displays_dead()) {
+					DSI_ERR("%s:ALL panel recovery failed with 6 times,reboot\n",
+							__func__);
+					BUG();
+				} else
+					DSI_INFO("(%s)Panel dead,disable ESD recovery for it\n",
+							panel->name);
+			} else
+				dsi_display_trigger_panel_dead_event(dsi_display);
 		} else {
 			DSI_INFO("Pwr_mode(0x0A) = 0x%x\n", pwr_mode);
-			panel_recovery_retry = 0;
+			panel->panel_recovery_retry = 0;
 		}
 	} else
 		DSI_INFO("-: no_panel_on_read_support is set\n");
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index c346d703a03f..f2cf1d85afca 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -367,8 +367,13 @@ struct dsi_panel {
 
 	enum touch_state tp_state;
 	bool tp_state_check_enable;
+
+	int panel_recovery_retry;
+	bool is_panel_dead;
 };
 
+bool dsi_display_all_displays_dead(void);
+
 static inline bool dsi_panel_ulps_feature_enabled(struct dsi_panel *panel)
 {
 	return panel->ulps_feature_enabled;

From 07b3e66569f6b68a0b1c93e8dce0fa22dbd103f4 Mon Sep 17 00:00:00 2001
From: shuoyan <shuoyan@motorola.com>
Date: Fri, 23 Oct 2020 11:04:16 +0800
Subject: [PATCH 061/116] drm/msm: Support Moto Panel param for dual panels

PROPAGATED from (CR)

Panel is black when HBM trigger.
The reason is CLI HBM commond set send to Primary Display.
Fix MOT`s panel param so it can support dual panels

Change-Id: Iaa4a0c974740571347a810d2517adcb830cb7795
Reviewed-on: https://gerrit.mot.com/1782933
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 12 +++++++++++-
 msm/dsi/dsi_panel.c   | 32 +++++++++++++++++++++++++++++---
 msm/dsi/dsi_panel.h   |  8 +++++---
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index f1f7e23071dc..5af48a3a86b9 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -4724,6 +4724,7 @@ static int dsi_display_res_init(struct dsi_display *display)
 	int rc = 0;
 	int i;
 	struct dsi_display_ctrl *ctrl;
+	u32 panel_idx = 0;
 
 	display_for_each_ctrl(i, display) {
 		ctrl = &display->ctrl[i];
@@ -4745,12 +4746,21 @@ static int dsi_display_res_init(struct dsi_display *display)
 		}
 	}
 
+	if (!strcmp(display->display_type, "primary"))
+		panel_idx = 0;
+	else if (!strcmp(display->display_type, "secondary"))
+		panel_idx = 1;
+	else {
+		DSI_WARN("Unalbe to find the display type");
+		panel_idx = 0;
+	}
 	display->panel = dsi_panel_get(&display->pdev->dev,
 				display->panel_node,
 				display->parser_node,
 				display->display_type,
 				display->cmdline_topology,
-				display->trusted_vm_env);
+				display->trusted_vm_env,
+				panel_idx);
 	if (IS_ERR_OR_NULL(display->panel)) {
 		rc = PTR_ERR(display->panel);
 		DSI_ERR("failed to get panel, rc=%d\n", rc);
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 052ca33d7f93..1ad44a4914fe 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -74,6 +74,24 @@ 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 hbm_map_s[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_s[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_val_map cabc_map_s[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,
@@ -83,6 +101,14 @@ 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}
 	},
+	{
+		{"HBM", hbm_map_s, HBM_STATE_NUM, HBM_OFF_STATE,
+				HBM_OFF_STATE, false},
+		{"ACL", acl_map_s, ACL_STATE_NUM, ACL_OFF_STATE,
+				ACL_OFF_STATE, false},
+		{"CABC", cabc_map_s, CABC_STATE_NUM, CABC_UI_STATE,
+				CABC_UI_STATE, false},
+	}
 };
 
 static void dsi_dce_prepare_pps_header(char *buf, u32 pps_delay_ms)
@@ -4065,13 +4091,13 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 				struct device_node *parser_node,
 				const char *type,
 				int topology_override,
-				bool trusted_vm_env)
+				bool trusted_vm_env,
+				u32 panel_idx)
 {
 	struct dsi_panel *panel;
 	struct dsi_parser_utils *utils;
 	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);
@@ -4114,7 +4140,7 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 		DSI_DEBUG("failed to parse mot_panel_config, rc = %d\n", rc);
 
 	panel->param_cmds = dsi_panel_param[panel_idx];
-	rc = dsi_panel_parse_param_prop(panel, of_node, 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);
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index f2cf1d85afca..90eb14030558 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -219,8 +219,9 @@ struct dsi_panel_spr_info {
 };
 
 enum panel_idx {
-        MAIN_IDX = 0,
-        PANEL_IDX_MAX,
+	MAIN_IDX = 0,
+	SEC_INX,
+	PANEL_IDX_MAX,
 };
 
 enum acl_state {
@@ -404,7 +405,8 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 				struct device_node *parser_node,
 				const char *type,
 				int topology_override,
-				bool trusted_vm_env);
+				bool trusted_vm_env,
+				u32 panel_idx);
 
 int dsi_panel_trigger_esd_attack(struct dsi_panel *panel, bool trusted_vm_env);
 

From 07544a623ad94c5bad6462e3870d88872955ca29 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Fri, 22 May 2020 17:53:14 +0800
Subject: [PATCH 062/116] dsi_display: add bl logs for panel resume and suspend

PROPAGATED_from (CR)

add bl logs for panel resume and suspend.
That we can check some "no display" issue.

Change-Id: I9ecbe59a3ce8931e81edb2f54aa66499995a9a7e
Reviewed-on: https://gerrit.mot.com/1782943
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
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
---
 msm/dsi/dsi_display.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 5af48a3a86b9..559741819121 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -231,6 +231,10 @@ int dsi_display_set_backlight(struct drm_connector *connector,
 		goto error;
 	}
 
+	if (!(panel->bl_config.bl_level && bl_lvl))
+		DSI_INFO("bl_level changed from %u to %u\n",
+		       (u32)(panel->bl_config.bl_level), (u32)bl_lvl);
+
 	panel->bl_config.bl_level = bl_lvl;
 
 	/* scale backlight */

From 4a042b2f3fb8c11077a404969a878bc09fa4f729 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Tue, 26 May 2020 10:20:31 +0800
Subject: [PATCH 063/116] sde: limit the backlight minimum brightness as
 bl_min_level

PROPAGATED_from (CR)

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, 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: Ifa20a92388c6dab20cf5550868f3f3685815936f
Reviewed-on: https://gerrit.mot.com/1782945
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
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
---
 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 09b77f4bed32..8b5897ebf4e0 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -120,6 +120,9 @@ static int sde_backlight_device_update_status(struct backlight_device *bd)
 	if (brightness > c_conn->thermal_max_brightness)
 		brightness = c_conn->thermal_max_brightness;
 
+	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 26fc3c214a1f2ec7a388dfdc6fd8cdc990853605 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Tue, 26 May 2020 16:14:15 +0800
Subject: [PATCH 064/116] dsi_panel: fix out-of-bounds  issue

PROPAGATED_from (CR)

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

Change-Id: If5debbae4957845bf6bd35f9f81eaca79faa54e5
Reviewed-on: https://gerrit.mot.com/1782951
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
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
---
 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 1ad44a4914fe..012a797f82b0 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -4054,6 +4054,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) {
@@ -4073,7 +4074,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) {
@@ -4081,6 +4082,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 e63a7de99a553913447ab0fc9312700e14cb26e9 Mon Sep 17 00:00:00 2001
From: shuoyan <shuoyan@motorola.com>
Date: Fri, 23 Oct 2020 15:09:53 +0800
Subject: [PATCH 065/116] disp:msm:dsi:add support to config dsi PHY Driver
 Strength

Hardware team required to set ordered DSI driver strength for
different DSI PHY.

Add support to config DSI PHY driver strength from DTSI config.

Change-Id: I60c5ee335c897d3f20dde42114798c15576cf32e
Reviewed-on: https://gerrit.mot.com/1783170
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_defs.h        |  1 +
 msm/dsi/dsi_display.c     | 10 ++++++++++
 msm/dsi/dsi_panel.c       | 28 ++++++++++++++++++++++++++++
 msm/dsi/dsi_phy.c         | 27 ++++++++++++++++++++++++++-
 msm/dsi/dsi_phy.h         | 10 ++++++++++
 msm/dsi/dsi_phy_hw.h      |  2 ++
 msm/dsi/dsi_phy_hw_v4_0.c |  5 +++++
 7 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 6c78879913a6..b863cc95f808 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -638,6 +638,7 @@ struct dsi_display_mode_priv_info {
 	u32 dsi_transfer_time_us;
 	u64 clk_rate_hz;
 	u64 min_dsi_clk_hz;
+	u32 phy_drive_strength;
 
 	struct msm_display_topology topology;
 	struct msm_display_dsc_info dsc;
diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 559741819121..7d517d3f36e4 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5783,6 +5783,16 @@ static int dsi_display_set_mode_sub(struct dsi_display *display,
 		dsi_display_validate_dms_fps(display->panel->cur_mode, mode);
 	}
 
+	if (priv_info->phy_drive_strength) {
+		display_for_each_ctrl(i, display) {
+			ctrl = &display->ctrl[i];
+			rc = dsi_phy_set_drive_strength_params(ctrl->phy,
+					priv_info->phy_drive_strength);
+			if (rc)
+				DSI_ERR("Fail to add drive strength params\n");
+		}
+	}
+
 	if (priv_info->phy_timing_len) {
 		display_for_each_ctrl(i, display) {
 			ctrl = &display->ctrl[i];
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 012a797f82b0..359102ed7b77 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2911,6 +2911,28 @@ error:
 	return rc;
 }
 
+static int dsi_panel_parse_phy_ldo(struct dsi_display_mode *mode,
+		struct dsi_parser_utils *utils)
+{
+	u32 data;
+	int rc = 0;
+	struct dsi_display_mode_priv_info *priv_info;
+
+	if (!mode || !mode->priv_info)
+		return -EINVAL;
+
+	priv_info = mode->priv_info;
+
+	rc = utils->read_u32(utils->data,
+			"qcom,mdss-dsi-panel-phy-drive-strength", &data);
+	if (rc)
+		DSI_DEBUG("Unsupport to set Phy Driver Strength\n");
+	else
+		priv_info->phy_drive_strength = data;
+
+	return rc;
+}
+
 static int dsi_panel_parse_phy_timing(struct dsi_display_mode *mode,
 		struct dsi_parser_utils *utils)
 {
@@ -4744,6 +4766,12 @@ int dsi_panel_get_mode(struct dsi_panel *panel,
 			DSI_ERR(
 			"failed to parse panel jitter config, rc=%d\n", rc);
 
+		rc = dsi_panel_parse_phy_ldo(mode, utils);
+		if (rc) {
+			DSI_ERR(
+			"failed to parse panel phy ldo rc=%d\n", rc);
+		}
+
 		rc = dsi_panel_parse_phy_timing(mode, utils);
 		if (rc) {
 			DSI_ERR(
diff --git a/msm/dsi/dsi_phy.c b/msm/dsi/dsi_phy.c
index f57b4245ecce..3ae158db391e 100644
--- a/msm/dsi/dsi_phy.c
+++ b/msm/dsi/dsi_phy.c
@@ -1114,6 +1114,32 @@ int dsi_phy_set_clk_freq(struct msm_dsi_phy *phy,
 	return 0;
 }
 
+/**
+ * dsi_phy_set_drive_strength_params - drive strength parameters for the panel
+ * @phy:          DSI PHY handle
+ * @drive strength:       array holding timing params.
+ *
+ * Return: error code.
+ */
+int dsi_phy_set_drive_strength_params(struct msm_dsi_phy *phy,
+			      u32 drive_strength)
+{
+	int rc = 0;
+
+	if (!phy || !drive_strength) {
+		DSI_PHY_ERR(phy, "Invalid params\n");
+		return -EINVAL;
+	}
+
+	mutex_lock(&phy->phy_lock);
+
+
+	phy->cfg.phy_drive_strength = drive_strength;
+
+	mutex_unlock(&phy->phy_lock);
+	return rc;
+}
+
 /**
  * dsi_phy_set_timing_params() - timing parameters for the panel
  * @phy:          DSI PHY handle
@@ -1147,7 +1173,6 @@ int dsi_phy_set_timing_params(struct msm_dsi_phy *phy,
 
 	if (phy->hw.ops.commit_phy_timing && commit)
 		phy->hw.ops.commit_phy_timing(&phy->hw, &phy->cfg.timing);
-
 	mutex_unlock(&phy->phy_lock);
 	return rc;
 }
diff --git a/msm/dsi/dsi_phy.h b/msm/dsi/dsi_phy.h
index 7fe7c060c8bf..0615d4a23adf 100644
--- a/msm/dsi/dsi_phy.h
+++ b/msm/dsi/dsi_phy.h
@@ -256,6 +256,16 @@ int dsi_phy_set_clamp_state(struct msm_dsi_phy *phy, bool enable);
 int dsi_phy_set_clk_freq(struct msm_dsi_phy *phy,
 		struct link_clk_freq *clk_freq);
 
+/**
+ * dsi_phy_set_drive_strength_params() - drive strength parameters for the panel
+ * @phy:          DSI PHY handle
+ * @drive_strength:         DSI PHY Drive Strength
+ *
+ * Return: error code.
+ */
+int dsi_phy_set_drive_strength_params(struct msm_dsi_phy *phy,
+				 u32 drive_strength);
+
 /**
  * dsi_phy_set_timing_params() - timing parameters for the panel
  * @phy:          DSI PHY handle
diff --git a/msm/dsi/dsi_phy_hw.h b/msm/dsi/dsi_phy_hw.h
index 97d3f86db3c4..dd78008470c9 100644
--- a/msm/dsi/dsi_phy_hw.h
+++ b/msm/dsi/dsi_phy_hw.h
@@ -103,6 +103,7 @@ struct dsi_phy_per_lane_cfgs {
  * @force_clk_lane_hs:Boolean whether to force clock lane in HS mode.
  * @phy_type:         Phy-type (Dphy/Cphy).
  * @bit_clk_rate_hz: DSI bit clk rate in HZ.
+ * @drive_strength: DSI PHY drive strength.
  */
 struct dsi_phy_cfg {
 	struct dsi_phy_per_lane_cfgs lanecfg;
@@ -115,6 +116,7 @@ struct dsi_phy_cfg {
 	bool force_clk_lane_hs;
 	enum dsi_phy_type phy_type;
 	unsigned long bit_clk_rate_hz;
+	u32 phy_drive_strength;
 };
 
 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 ae50b70dbeef..14bc5448f417 100644
--- a/msm/dsi/dsi_phy_hw_v4_0.c
+++ b/msm/dsi/dsi_phy_hw_v4_0.c
@@ -349,6 +349,11 @@ static void dsi_phy_hw_dphy_enable(struct dsi_phy_hw *phy,
 		glbl_rescode_bot_ctrl = less_than_1500_mhz ? 0x39 :  0x3c;
 		glbl_str_swi_cal_sel_ctrl = 0x00;
 		glbl_hstx_str_ctrl_0 = 0x88;
+
+		if (cfg->phy_drive_strength != glbl_hstx_str_ctrl_0) {
+			glbl_str_swi_cal_sel_ctrl = 0x03;
+			glbl_hstx_str_ctrl_0 = cfg->phy_drive_strength;
+		}
 	} else {
 		vreg_ctrl_0 = less_than_1500_mhz ? 0x5B : 0x59;
 		glbl_str_swi_cal_sel_ctrl = less_than_1500_mhz ? 0x03 : 0x00;

From e2b72b25483e6db8a29a0dc431e85e0397351304 Mon Sep 17 00:00:00 2001
From: zhanggb <zhanggb@motorola.com>
Date: Wed, 26 Aug 2020 18:41:14 +0800
Subject: [PATCH 066/116] dsi: fix motUtil mipi read error

MIPI_DSI_MSG_READ in msg.flags caused dsi panel detect error. Thus
motUtil mipi read block somewhere. Remove it.

Change-Id: I41efade780574893408190bf43b626fbf3b97856
Reviewed-on: https://gerrit.mot.com/1783186
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
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
---
 msm/dsi/dsi_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 7d517d3f36e4..ec139ac49bc1 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -1150,7 +1150,7 @@ static int dsi_display_dispUtil_prepare(const char *cmd_buf, u32 cmd_buf_len,
 	/* 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.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];

From ea3e3a4d0c88d92892550c386247997acfae774f Mon Sep 17 00:00:00 2001
From: daiss1 <daiss1@lenovo.com>
Date: Mon, 14 Sep 2020 11:04:40 +0800
Subject: [PATCH 067/116] msm/dsi:Modify judgment conditions,add judgments
 hbm2.

HBM 1 and HBM2 are assigned as HBM on.
When HBM is off, the value is HBM off.

Change-Id: Iacf17b60725dfe1d2cc2f7206063b81e2e7e98aa
Reviewed-on: https://gerrit.mot.com/1783197
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 90eb14030558..1d7ddfd55ac6 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -42,8 +42,8 @@
 
 #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)
+#define HBM_BRIGHTNESS(value) ((value) == HBM_OFF_STATE ?\
+			BRIGHTNESS_HBM_OFF : BRIGHTNESS_HBM_ON)
 
 /* HBM implementation is different, depending on display and backlight hardware
  * design, which is classified into the following types:

From 692f07355210d840a96d8e081ce49cbe9f2f62eb Mon Sep 17 00:00:00 2001
From: shuoyan <shuoyan@motorola.com>
Date: Wed, 7 Oct 2020 11:13:47 -0500
Subject: [PATCH 068/116] msm/dsi: add backlight debug log when panel is off

There have few cases which no brightnes when panel on.
Add more backlight logs to debug this issue.

Change-Id: I2c25f15f1617f894ecb84efc7c15340cbfc89ad5
Reviewed-on: https://gerrit.mot.com/1783198
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Shuo Yan <shuoyan@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index ec139ac49bc1..425e33d097c2 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -227,6 +227,7 @@ int dsi_display_set_backlight(struct drm_connector *connector,
 
 	mutex_lock(&panel->panel_lock);
 	if (!dsi_panel_initialized(panel)) {
+		DSI_INFO("Ignor bl_level %u as panel is not init.\n",(u32)bl_lvl);
 		rc = -EINVAL;
 		goto error;
 	}

From 1339782e2cf43a24e659814ecc286bcb05668fda Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Fri, 23 Oct 2020 15:37:52 +0800
Subject: [PATCH 069/116] Revert "(CR) dsi: pushing display notifications"

This reverts commit 2da822bf859e4c166c09706f62292a657273104e.
From Kernel-5.4, Send panel_notify at msm_atomic.c.
So do not add this old notify method.
Mot-CRs-fixed: (CR)

Change-Id: I16778dc0a404b1ab20e59bc73a40d32385bdc01b
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1783211
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jun Weng <wengjun1@motorola.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c |  8 ++------
 msm/dsi/dsi_display.h |  2 --
 msm/dsi/dsi_panel.c   | 34 ----------------------------------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 425e33d097c2..85bfe304119d 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6519,15 +6519,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";
-		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 63b4b91faf51..1de87cb0019a 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -145,7 +145,6 @@ 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
@@ -210,7 +209,6 @@ 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 359102ed7b77..75ffd00a677a 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -11,17 +11,6 @@
 #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"
@@ -5502,19 +5491,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;
@@ -5573,9 +5549,6 @@ 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);
@@ -5607,9 +5580,6 @@ int dsi_panel_post_enable(struct dsi_panel *panel)
 			       panel->name, rc);
 		}
 	}
-
-	PANEL_NOTIFY(PANEL_EVENT_DISPLAY_ON);
-
 error:
 	mutex_unlock(&panel->panel_lock);
 	return rc;
@@ -5636,8 +5606,6 @@ 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;
@@ -5686,8 +5654,6 @@ 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 eb4eb54d415e0cf60f0595cb65e0fc95f20c0cea Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Mon, 26 Oct 2020 14:09:53 +0800
Subject: [PATCH 070/116] dsi_panel: Add support the state 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 touch state is  0, Instead,
        the touch state is 1.
    3. Touch driver will call set() function to set the touch state,
        And panel driver will call check() function to check  state.

Change-Id: I034909007678ae940769ec8e350518185cc5fad3
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1784647
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Jun Weng <wengjun1@motorola.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: litong <litong20@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c |  9 ++++-----
 msm/dsi/dsi_display.h |  2 +-
 msm/dsi/dsi_panel.c   | 29 +++++++++++++++++++++++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 85bfe304119d..b027fc73e723 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -4729,7 +4729,6 @@ static int dsi_display_res_init(struct dsi_display *display)
 	int rc = 0;
 	int i;
 	struct dsi_display_ctrl *ctrl;
-	u32 panel_idx = 0;
 
 	display_for_each_ctrl(i, display) {
 		ctrl = &display->ctrl[i];
@@ -4752,12 +4751,12 @@ static int dsi_display_res_init(struct dsi_display *display)
 	}
 
 	if (!strcmp(display->display_type, "primary"))
-		panel_idx = 0;
+		display->panel_idx = 0;
 	else if (!strcmp(display->display_type, "secondary"))
-		panel_idx = 1;
+		display->panel_idx = 1;
 	else {
 		DSI_WARN("Unalbe to find the display type");
-		panel_idx = 0;
+		display->panel_idx = 0;
 	}
 	display->panel = dsi_panel_get(&display->pdev->dev,
 				display->panel_node,
@@ -4765,7 +4764,7 @@ static int dsi_display_res_init(struct dsi_display *display)
 				display->display_type,
 				display->cmdline_topology,
 				display->trusted_vm_env,
-				panel_idx);
+				display->panel_idx);
 	if (IS_ERR_OR_NULL(display->panel)) {
 		rc = PTR_ERR(display->panel);
 		DSI_ERR("failed to get panel, rc=%d\n", rc);
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index 1de87cb0019a..f8d67ac8759f 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -302,8 +302,8 @@ struct dsi_display {
 
 	int tx_cmd_buf_ndx;
 	struct dsi_panel_cmd_set cmd_set;
-
 	bool enabled;
+	u32 panel_idx;
 };
 
 int dsi_display_dev_probe(struct platform_device *pdev);
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 75ffd00a677a..dda75a867ead 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -397,7 +397,32 @@ static int dsi_panel_set_pinctrl_state(struct dsi_panel *panel, bool enable)
 	return rc;
 }
 
-#if defined(CONFIG_PANEL_NOTIFICATIONS)
+#if defined(MOTO_PANEL_CHECK_TOUCH_STATE)
+static int touch_state[PANEL_IDX_MAX] = {0};
+int touch_set_state(int state, int panel_idx)
+{
+	int rc = 0;
+
+	if (panel_idx >= PANEL_IDX_MAX)
+		rc = -EINVAL;
+	else
+		touch_state[panel_idx] = state;
+
+	return rc;
+}
+EXPORT_SYMBOL_GPL(touch_set_state);
+
+static int check_touch_state(int *state, int panel_idx)
+{
+	int rc = 0;
+
+	if (panel_idx >= PANEL_IDX_MAX) rc = -EINVAL;
+	else *state = touch_state[panel_idx];
+
+	return rc;
+}
+
+
 static bool panel_power_is_alway_on(struct dsi_panel *panel)
 {
 	int touch_state = 0;
@@ -409,7 +434,7 @@ static bool panel_power_is_alway_on(struct dsi_panel *panel)
 	if (unlikely(dsi_display == NULL))
 		return rc;
 
-	if( check_touch_state(&touch_state, dsi_display->display_idx) == 0)
+	if( check_touch_state(&touch_state, dsi_display->panel_idx) == 0)
 	{
 		panel->tp_state = touch_state;
 		rc = touch_state ? 1: 0;

From 7819f82461b15a79fd0a00ce4dddf962ff67ec7a Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Wed, 4 Nov 2020 13:46:08 +0800
Subject: [PATCH 071/116] dsi_panel: remove MOTO_PANEL_CHECK_TOUCH_STATE

Remove MOTO_PANEL_CHECK_TOUCH_STATE, we alway compile this
code. When "tp_state_check_enable"  is define at device tree file , then
call "check_state" function to get touch state.

Change-Id: Iccdff4a408eb9ad27b71c8394b4c4a844da7b238
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1793078
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Jun Weng <wengjun1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index dda75a867ead..70ebab4f6659 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -397,7 +397,7 @@ static int dsi_panel_set_pinctrl_state(struct dsi_panel *panel, bool enable)
 	return rc;
 }
 
-#if defined(MOTO_PANEL_CHECK_TOUCH_STATE)
+
 static int touch_state[PANEL_IDX_MAX] = {0};
 int touch_set_state(int state, int panel_idx)
 {
@@ -422,7 +422,6 @@ static int check_touch_state(int *state, int panel_idx)
 	return rc;
 }
 
-
 static bool panel_power_is_alway_on(struct dsi_panel *panel)
 {
 	int touch_state = 0;
@@ -442,12 +441,6 @@ static bool panel_power_is_alway_on(struct dsi_panel *panel)
 
 	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)
 {

From 524826043fe4aeab86e306b93faf1de21aef17d4 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Fri, 27 Nov 2020 11:09:15 +0800
Subject: [PATCH 072/116] dsi_display: remove "MMI_STOPSHIP"

The function is ready for other project.
SO remove "MMI_STOPSHIP"

Change-Id: I33d83dc84641f6765ffd8c39cc4a01d19bcf62f6
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1812530
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index b027fc73e723..e053a2890fa2 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -8811,7 +8811,6 @@ static void dsi_display_panel_id_notification(struct dsi_display *display)
 	}
 }
 
-/* start of MMI_STOPSHIP section */
 struct dsi_enable_status {
 	struct dsi_display *display;
 	int probed;

From 02cf7cde50e35bde8765d16227dde1cdc929a802 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@motorola.com>
Date: Wed, 9 Dec 2020 10:54:22 +0800
Subject: [PATCH 073/116] dsi_pwr: Keep one regulator always on

Some panels must let ldo always on.
We must add "qcom,supply-always-on" in "qcom,panel-supply-entry".

Change-Id: I81669aa225df0abde26e407c391c56412ee7a109
Signed-off-by: houdz1 <houdz1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1822732
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Tested-by: Jira Key
Submit-Approved: Jira Key
---
 msm/dsi/dsi_pwr.c | 15 +++++++++++++++
 msm/dsi/dsi_pwr.h |  1 +
 2 files changed, 16 insertions(+)

diff --git a/msm/dsi/dsi_pwr.c b/msm/dsi/dsi_pwr.c
index 4dee0409d87c..47ae26cf66ee 100644
--- a/msm/dsi/dsi_pwr.c
+++ b/msm/dsi/dsi_pwr.c
@@ -22,6 +22,7 @@ static int dsi_pwr_parse_supply_node(struct dsi_parser_utils *utils,
 	int i = 0;
 	u32 tmp = 0;
 	struct device_node *node = NULL;
+	bool is_always_on = FALSE;
 
 	dsi_for_each_child_node(root, node) {
 		const char *st = NULL;
@@ -112,6 +113,14 @@ static int dsi_pwr_parse_supply_node(struct dsi_parser_utils *utils,
 			regs->vregs[i].post_off_sleep = tmp;
 		}
 
+		is_always_on = utils->read_bool(node, "qcom,supply-always-on");
+		if (!is_always_on) {
+			DSI_DEBUG("qcom,supply-always-on not specified\n");
+		} else {
+			regs->vregs[i].is_always_on = is_always_on;
+			DSI_INFO("%s: always-on is specified\n", regs->vregs[i].vreg_name);
+		}
+
 		DSI_DEBUG("[%s] minv=%d maxv=%d, en_load=%d, dis_load=%d\n",
 			 regs->vregs[i].vreg_name,
 			 regs->vregs[i].min_voltage,
@@ -206,6 +215,12 @@ static int dsi_pwr_enable_vregs(struct dsi_regulator_info *regs, bool enable)
 			pre_off_ms = vreg->pre_off_sleep;
 			post_off_ms = vreg->post_off_sleep;
 
+			if (vreg->is_always_on)
+			{
+				DSI_INFO("%s is always on\n", vreg->vreg_name);
+				continue;
+			}
+
 			if (pre_off_ms)
 				usleep_range((pre_off_ms * 1000),
 						(pre_off_ms * 1000) + 10);
diff --git a/msm/dsi/dsi_pwr.h b/msm/dsi/dsi_pwr.h
index 8e808b63a2f8..aef2feae3121 100644
--- a/msm/dsi/dsi_pwr.h
+++ b/msm/dsi/dsi_pwr.h
@@ -41,6 +41,7 @@ struct dsi_vreg {
 	u32 post_on_sleep;
 	u32 pre_off_sleep;
 	u32 post_off_sleep;
+	bool is_always_on;
 };
 
 /**

From 10928a3277f40b21a19f9d8791abcd8cd851daf1 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Fri, 18 Dec 2020 15:25:17 +0800
Subject: [PATCH 074/116] dsi: send command to notify panel when switch FPS

Some panel need send command to DDIC.
That TP can get the current refresh rate.

Change-Id: Iecd1e4675729d1f74461f8d56f8115e4808fa8e2
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1831813
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_defs.h    |  4 ++++
 msm/dsi/dsi_display.c |  4 ++++
 msm/dsi/dsi_panel.c   | 44 +++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h   |  2 ++
 4 files changed, 54 insertions(+)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index b863cc95f808..d6893e028642 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -271,6 +271,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_DFPS_CMD_90:               DFPS switch to 90
+ * @DSI_CMD_SET_DFPS_CMD_60:               DFPS switch to 60
 
  * @DSI_CMD_SET_MAX
  */
@@ -307,6 +309,8 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_CABC_UI,
 	DSI_CMD_SET_CABC_MV,
 	DSI_CMD_SET_CABC_DIS,
+	DSI_CMD_SET_DFPS_CMD_90,
+	DSI_CMD_SET_DFPS_CMD_60,
 	DSI_CMD_SET_MAX
 };
 
diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index e053a2890fa2..aee3cfdab0c0 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5732,6 +5732,10 @@ static int dsi_display_set_mode_sub(struct dsi_display *display,
 					DSI_ERR("Fail to add timing params\n");
 			}
 		}
+
+		if (display->panel->dfps_caps.dfps_send_cmd_support)
+			dsi_panel_dfps_send_cmd(display->panel);
+
 		if (!(mode->dsi_mode_flags & DSI_MODE_FLAG_DYN_CLK))
 			return rc;
 	}
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 70ebab4f6659..3adbb9636c11 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1882,6 +1882,9 @@ static int dsi_panel_parse_dfps_caps(struct dsi_panel *panel)
 			dfps_caps->max_refresh_rate = dfps_caps->dfps_list[i];
 	}
 
+	dfps_caps->dfps_send_cmd_support = utils->read_bool(utils->data,
+			"qcom,mdss-dsi-pan-dpfs-send-command");
+
 error:
 	return rc;
 }
@@ -2164,6 +2167,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-dfps-90-command",
+	"qcom,mdss-dsi-dfps-60-command",
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -2199,6 +2204,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-dfps-90-command-state",
+	"qcom,mdss-dsi-dfps-60-command-state",
 };
 
 int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
@@ -5720,3 +5727,40 @@ error:
 	mutex_unlock(&panel->panel_lock);
 	return rc;
 }
+
+int dsi_panel_dfps_send_cmd(struct dsi_panel *panel)
+{
+	struct dsi_display_mode *mode;
+	u32 refresh_rate = 60;
+	u32 i;
+	enum dsi_cmd_set_type type = DSI_CMD_SET_DFPS_CMD_60;
+	char cmd_set_prop[64];
+	int rc = 0;
+
+	if (!panel || !panel->cur_mode)
+		return -EINVAL;
+
+	mutex_lock(&panel->panel_lock);
+	mode = panel->cur_mode;
+	refresh_rate = panel->cur_mode->timing.refresh_rate;
+
+	snprintf(cmd_set_prop, sizeof(cmd_set_prop), "qcom,mdss-dsi-dfps-%d-command", refresh_rate);
+
+	for (i = DSI_CMD_SET_PRE_ON; i < DSI_CMD_SET_MAX; i++) {
+		if (!strcmp(cmd_set_prop, cmd_set_prop_map[i])) {
+			type = i;
+			break;
+		}
+	}
+
+	DSI_INFO("prop %s refresh_rate %d type %d\n", cmd_set_prop, refresh_rate, type);
+
+	rc = dsi_panel_tx_cmd_set(panel, type);
+	if (rc) {
+		DSI_ERR("[%s] failed to send %s cmds, rc=%d\n",
+		       panel->name, cmd_set_prop_map[type], rc);
+	}
+	mutex_unlock(&panel->panel_lock);
+
+	return rc;
+}
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 1d7ddfd55ac6..d61e117bc6c5 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -117,6 +117,7 @@ struct dsi_dfps_capabilities {
 	u32 *dfps_list;
 	u32 dfps_list_len;
 	bool dfps_support;
+	bool dfps_send_cmd_support;
 };
 
 struct dsi_qsync_capabilities {
@@ -523,5 +524,6 @@ int dsi_panel_get_elvss_data(struct dsi_panel *panel);
 int dsi_panel_get_elvss_data_1(struct dsi_panel *panel);
 int dsi_panel_set_elvss_dim_off(struct dsi_panel *panel, u8 val);
 int dsi_panel_parse_elvss_config(struct dsi_panel *panel, u8 elv_vl);
+int dsi_panel_dfps_send_cmd(struct dsi_panel *panel);
 
 #endif /* _DSI_PANEL_H_ */

From 97771405eff893f78ab71e67f581f0a840abd3ed Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Thu, 31 Dec 2020 15:15:40 +0800
Subject: [PATCH 075/116] msm/dsi: add panel supplier sys node

msm/dsi:
Add panel supplier sys node.
/sys/class/panel/.

Change-Id: I07c22bad06fa420e903ea7b8fcc2855b1ec5Montana0
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1840249
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 66 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index aee3cfdab0c0..bf2cecd4b714 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6477,6 +6477,70 @@ static void dsi_display_firmware_display(const struct firmware *fw,
 	DSI_DEBUG("success\n");
 }
 
+/*
+	Add /sys/class/panel path, other module can get panel info from this path.
+*/
+static ssize_t panel_supplier_show(struct device *dev,
+	struct device_attribute *attr, char *buf)
+{
+	struct dsi_display *display;
+	struct platform_device *pdev = to_platform_device(dev);
+
+	display = platform_get_drvdata(pdev);
+	return scnprintf(buf, PAGE_SIZE, display->panel->panel_supplier);
+}
+
+static struct device_attribute panel_attributes[] = {
+	__ATTR_RO(panel_supplier),
+	__ATTR_NULL
+};
+
+static int panel_class_create(struct platform_device *pdev)
+{
+	static struct class *panel_class;
+	static struct device *panel_class_dev;
+	struct device_attribute *attrs = panel_attributes;
+	struct dsi_display *display = NULL;
+	int i, error = 0;
+
+	panel_class = class_create(THIS_MODULE, "panel");
+	if (IS_ERR(panel_class)) {
+		error = PTR_ERR(panel_class);
+		panel_class = NULL;
+		return error;
+	}
+
+	display = platform_get_drvdata(pdev);
+	panel_class_dev = device_create(panel_class, NULL, 0, display,
+		display->panel->panel_supplier);
+	if (IS_ERR(panel_class_dev)) {
+		error = PTR_ERR(panel_class_dev);
+		panel_class_dev = NULL;
+		return error;
+	}
+
+	for (i = 0; attrs[i].attr.name != NULL; ++i) {
+		error = device_create_file(panel_class_dev, &attrs[i]);
+		if (error)
+			break;
+	}
+
+	if (error)
+		goto device_destroy;
+
+	return 0;
+
+device_destroy:
+	for (--i; i >= 0; --i)
+		device_remove_file(panel_class_dev, &attrs[i]);
+	device_destroy(panel_class, 0);
+	panel_class_dev = NULL;
+	class_unregister(panel_class);
+	DSI_ERR("creating panel class failed\n");
+
+	return -ENODEV;
+}
+
 int dsi_display_dev_probe(struct platform_device *pdev)
 {
 	struct dsi_display *display = NULL;
@@ -6577,6 +6641,8 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 			goto end;
 	}
 
+	panel_class_create(pdev);
+
 	return 0;
 end:
 	if (display)

From 81eecf4203375b6bdea203553d414f32cd5ed46d Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Tue, 12 Jan 2021 14:09:49 +0800
Subject: [PATCH 076/116] Revert "(CR) msm/dsi: add panel supplier sys node"

This reverts commit 97e133d11ef9a051a78cdf02b51a849997b67cec.
Create sys node under drm path.
Mot-CRs-fixed: (CR)

Change-Id: Ic11c44993f018c37c9694aee2fcc7c0e172c5fb0
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1849209
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_display.c | 66 -------------------------------------------
 1 file changed, 66 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index bf2cecd4b714..aee3cfdab0c0 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6477,70 +6477,6 @@ static void dsi_display_firmware_display(const struct firmware *fw,
 	DSI_DEBUG("success\n");
 }
 
-/*
-	Add /sys/class/panel path, other module can get panel info from this path.
-*/
-static ssize_t panel_supplier_show(struct device *dev,
-	struct device_attribute *attr, char *buf)
-{
-	struct dsi_display *display;
-	struct platform_device *pdev = to_platform_device(dev);
-
-	display = platform_get_drvdata(pdev);
-	return scnprintf(buf, PAGE_SIZE, display->panel->panel_supplier);
-}
-
-static struct device_attribute panel_attributes[] = {
-	__ATTR_RO(panel_supplier),
-	__ATTR_NULL
-};
-
-static int panel_class_create(struct platform_device *pdev)
-{
-	static struct class *panel_class;
-	static struct device *panel_class_dev;
-	struct device_attribute *attrs = panel_attributes;
-	struct dsi_display *display = NULL;
-	int i, error = 0;
-
-	panel_class = class_create(THIS_MODULE, "panel");
-	if (IS_ERR(panel_class)) {
-		error = PTR_ERR(panel_class);
-		panel_class = NULL;
-		return error;
-	}
-
-	display = platform_get_drvdata(pdev);
-	panel_class_dev = device_create(panel_class, NULL, 0, display,
-		display->panel->panel_supplier);
-	if (IS_ERR(panel_class_dev)) {
-		error = PTR_ERR(panel_class_dev);
-		panel_class_dev = NULL;
-		return error;
-	}
-
-	for (i = 0; attrs[i].attr.name != NULL; ++i) {
-		error = device_create_file(panel_class_dev, &attrs[i]);
-		if (error)
-			break;
-	}
-
-	if (error)
-		goto device_destroy;
-
-	return 0;
-
-device_destroy:
-	for (--i; i >= 0; --i)
-		device_remove_file(panel_class_dev, &attrs[i]);
-	device_destroy(panel_class, 0);
-	panel_class_dev = NULL;
-	class_unregister(panel_class);
-	DSI_ERR("creating panel class failed\n");
-
-	return -ENODEV;
-}
-
 int dsi_display_dev_probe(struct platform_device *pdev)
 {
 	struct dsi_display *display = NULL;
@@ -6641,8 +6577,6 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 			goto end;
 	}
 
-	panel_class_create(pdev);
-
 	return 0;
 end:
 	if (display)

From f5b4d7047bbad51bb158e9227399067af8ad079d Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Tue, 12 Jan 2021 14:28:49 +0800
Subject: [PATCH 077/116] msm/display: add more panel info sys node

msm/display:
Add more panel info sys node for moto care.
Use drm_conn->kdev to get
/sys/class/drm/card0-DSI-1 handle:
panelId
panelName
panelVer
panelRegDA
panelSupplier

Change-Id: Iefb5dc5816a885fda0c69700d2dd9ffe2eeb43a0
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1845582
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_display.c | 114 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index aee3cfdab0c0..5fdc05795d19 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6477,6 +6477,118 @@ static void dsi_display_firmware_display(const struct firmware *fw,
 	DSI_DEBUG("success\n");
 }
 
+/*
+	Add /sys/class/drm path, other module can get panel info from this path.
+*/
+struct dsi_display *display_panel = NULL;
+static ssize_t panelId_show(struct device *dev,
+			struct device_attribute *attr,
+			char *buf)
+{
+	int written = 0;
+
+	mutex_lock(&display_panel->drm_conn->dev->mode_config.mutex);
+	written = snprintf(buf, PAGE_SIZE, "0x%016llx\n",
+	display_panel->panel->panel_id);
+	mutex_unlock(&display_panel->drm_conn->dev->mode_config.mutex);
+
+	return written;
+}
+
+static ssize_t panelVer_show(struct device *dev,
+			struct device_attribute *attr,
+			char *buf)
+{
+	int written = 0;
+
+	mutex_lock(&display_panel->drm_conn->dev->mode_config.mutex);
+	written = snprintf(buf, PAGE_SIZE, "0x%016llx\n",
+	display_panel->panel->panel_ver);
+	mutex_unlock(&display_panel->drm_conn->dev->mode_config.mutex);
+
+	return written;
+}
+
+static ssize_t panelName_show(struct device *dev,
+			struct device_attribute *attr,
+			char *buf)
+{
+	int written = 0;
+
+	mutex_lock(&display_panel->drm_conn->dev->mode_config.mutex);
+	written = snprintf(buf, PAGE_SIZE, "%s\n", display_panel->panel->panel_name);
+	mutex_unlock(&display_panel->drm_conn->dev->mode_config.mutex);
+
+	return written;
+}
+
+static ssize_t panelRegDA_show(struct device *dev,
+			struct device_attribute *attr,
+			char *buf)
+{
+	int written = 0;
+
+	mutex_lock(&display_panel->drm_conn->dev->mode_config.mutex);
+	written = snprintf(buf, PAGE_SIZE, "0x%02x\n", display_panel->panel->panel_regDA);
+	mutex_unlock(&display_panel->drm_conn->dev->mode_config.mutex);
+
+	return written;
+}
+
+static ssize_t panelSupplier_show(struct device *dev,
+	struct device_attribute *attr, char *buf)
+{
+	int written = 0;
+
+	mutex_lock(&display_panel->drm_conn->dev->mode_config.mutex);
+	written = scnprintf(buf, PAGE_SIZE, display_panel->panel->panel_supplier);
+	mutex_unlock(&display_panel->drm_conn->dev->mode_config.mutex);
+
+	return written;
+}
+
+static struct device_attribute panel_attributes[] = {
+	__ATTR_RO(panelId),
+	__ATTR_RO(panelVer),
+	__ATTR_RO(panelName),
+	__ATTR_RO(panelRegDA),
+	__ATTR_RO(panelSupplier),
+	__ATTR_NULL
+};
+
+#define DRM_RETRY_TIMES 3
+static int panel_class_create(struct platform_device *pdev)
+{
+	struct device_attribute *attrs = panel_attributes;
+	int i, j, error = 0;
+
+	display_panel = platform_get_drvdata(pdev);
+
+	for (j = 0; j < DRM_RETRY_TIMES; j++) {
+		if (display_panel->drm_conn->kdev) {
+			for (i = 0; attrs[i].attr.name != NULL; ++i) {
+				error = device_create_file(display_panel->drm_conn->kdev, &attrs[i]);
+				if (error)
+					break;
+			}
+		} else {
+			DSI_ERR("drm_conn->kdev is NULL, retry %d times\n", j);
+		}
+	}
+
+	if (error)
+		goto device_destroy;
+
+	return 0;
+
+device_destroy:
+	for (--i; i >= 0; --i)
+		device_remove_file(display_panel->drm_conn->kdev, &attrs[i]);
+	DSI_ERR("creating panel class failed\n");
+
+	return -ENODEV;
+}
+
 int dsi_display_dev_probe(struct platform_device *pdev)
 {
 	struct dsi_display *display = NULL;
@@ -6577,6 +6689,8 @@ int dsi_display_dev_probe(struct platform_device *pdev)
 			goto end;
 	}
 
+	panel_class_create(pdev);
+
 	return 0;
 end:
 	if (display)

From 83d72184f09c8d6d291cc6a600b62943ace4e8a5 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Wed, 13 Jan 2021 16:24:50 +0800
Subject: [PATCH 078/116] dsi_phy_v3.0: Get strength offset from dtsi file and
 set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The clock and data lanes have a calibration circuitry feature. To offset the drive
strength from the calibrated value in an increasing or decreasing manner, use 6 bit two’s
complement values.

Change-Id: I1cb612b4f62ea6af07165ffd1fb8e15528200e5e
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1850370
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_phy.c         | 2 +-
 msm/dsi/dsi_phy_hw_v3_0.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_phy.c b/msm/dsi/dsi_phy.c
index 3ae158db391e..4aaeabd93c2e 100644
--- a/msm/dsi/dsi_phy.c
+++ b/msm/dsi/dsi_phy.c
@@ -63,7 +63,7 @@ static const struct dsi_ver_spec_info dsi_phy_v2_0 = {
 static const struct dsi_ver_spec_info dsi_phy_v3_0 = {
 	.version = DSI_PHY_VERSION_3_0,
 	.lane_cfg_count = 4,
-	.strength_cfg_count = 2,
+	.strength_cfg_count = 4,
 	.regulator_cfg_count = 0,
 	.timing_cfg_count = 12,
 };
diff --git a/msm/dsi/dsi_phy_hw_v3_0.c b/msm/dsi/dsi_phy_hw_v3_0.c
index a863827050ad..4b8992bc07c3 100644
--- a/msm/dsi/dsi_phy_hw_v3_0.c
+++ b/msm/dsi/dsi_phy_hw_v3_0.c
@@ -194,8 +194,8 @@ static void dsi_phy_hw_v3_0_lane_settings(struct dsi_phy_hw *phy,
 		DSI_W32(phy, DSIPHY_LNX_CFG1(i), cfg->lanecfg.lane[i][1]);
 		DSI_W32(phy, DSIPHY_LNX_CFG2(i), cfg->lanecfg.lane[i][2]);
 		DSI_W32(phy, DSIPHY_LNX_CFG3(i), cfg->lanecfg.lane[i][3]);
-		DSI_W32(phy, DSIPHY_LNX_OFFSET_TOP_CTRL(i), 0x0);
-		DSI_W32(phy, DSIPHY_LNX_OFFSET_BOT_CTRL(i), 0x0);
+		DSI_W32(phy, DSIPHY_LNX_OFFSET_TOP_CTRL(i), cfg->strength.lane[i][2]);
+		DSI_W32(phy, DSIPHY_LNX_OFFSET_BOT_CTRL(i), cfg->strength.lane[i][3]);
 		DSI_W32(phy, DSIPHY_LNX_TX_DCTRL(i), tx_dctrl[i]);
 	}
 }

From da28d89b796b0e350cbe5933c593e71db1f7e337 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Tue, 18 May 2021 18:03:27 +0800
Subject: [PATCH 079/116] Revert "(CR): drm: mipi: Disable the MIPI DSI
 commands 0x2E and 0x3E"

This reverts commit 98f75f797773394bdb81969aa795d3eeb68642ad.
Mot-CRs-fixed: (CR)

MIPI_DCS_READ_MEMORY_CONTINUE =0x3E
MIPI_DCS_READ_MEMORY_START =0x2C

These commands for page 0 is MIPI DCS commands.
But For other pages, these commands(0x3E,0x2C) maybe normal register.
So these codes are not right.
And we haven't get the requirement to disable 0x3E and 0x2C, SO we revert
these changes first.

Change-Id: I5e18a5e52420ceb78dc298598b097d70011151dd
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1952409
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Reviewed-by: Shanshan Dai <daiss1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_ctrl.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/msm/dsi/dsi_ctrl.c b/msm/dsi/dsi_ctrl.c
index cf83c21aea88..278e3dcbe921 100644
--- a/msm/dsi/dsi_ctrl.c
+++ b/msm/dsi/dsi_ctrl.c
@@ -1542,7 +1542,6 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl,
 	u8 *buffer = NULL;
 	u32 cnt = 0;
 	u8 *cmdbuf;
-	const u8 *dsi_buf;
 
 	/* Select the tx mode to transfer the command */
 	dsi_message_setup_tx_mode(dsi_ctrl, msg->tx_len, flags);
@@ -1587,14 +1586,6 @@ static int dsi_message_tx(struct dsi_ctrl *dsi_ctrl,
 		goto kickoff;
 	}
 
-	dsi_buf = msg->tx_buf;
-	if ((dsi_buf[0] == MIPI_DCS_READ_MEMORY_START) ||
-		(dsi_buf[0] == MIPI_DCS_READ_MEMORY_CONTINUE)) {
-                DSI_CTRL_ERR(dsi_ctrl, "%s: Invalid dsi_cmd=0x%4x\n", __func__, dsi_buf[0]);
-		rc = -EINVAL;
-		goto error;
-        }
-
 	rc = mipi_dsi_create_packet(&packet, msg);
 	if (rc) {
 		DSI_CTRL_ERR(dsi_ctrl, "Failed to create message packet, rc=%d\n",

From 663d13e0a0a91cf36035e485259411687bb8b3bc Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Thu, 10 Jun 2021 15:36:46 +0800
Subject: [PATCH 080/116] kernel: add supports configurable Datatype of
 compress pixel stream

Some panel IC can not support 0x0b for compress pixel stream's DataType.
For example gc7372, it will use 0x3E for compress pixel stream's DataType.

Change-Id: Ie9bc90d79b11033414658d93e0b39137c6f4f8e0
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1976131
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Hujun Liao <liaohj@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_ctrl_hw_cmn.c | 6 ++++--
 msm/dsi/dsi_panel.c       | 8 ++++++++
 msm/msm_drv.h             | 2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_ctrl_hw_cmn.c b/msm/dsi/dsi_ctrl_hw_cmn.c
index df9954da0454..50dc8a060463 100644
--- a/msm/dsi/dsi_ctrl_hw_cmn.c
+++ b/msm/dsi/dsi_ctrl_hw_cmn.c
@@ -332,7 +332,7 @@ void dsi_ctrl_hw_cmn_set_video_timing(struct dsi_ctrl_hw *ctrl,
 	u32 reg = 0;
 	u32 hs_start = 0;
 	u32 hs_end, active_h_start, active_h_end, h_total, width = 0;
-	u32 bytes_per_pkt, pkt_per_line, eol_byte_num;
+	u32 bytes_per_pkt, pkt_per_line, eol_byte_num, datatype;
 	u32 vs_start = 0, vs_end = 0;
 	u32 vpos_start = 0, vpos_end, active_v_start, active_v_end, v_total;
 
@@ -342,7 +342,9 @@ void dsi_ctrl_hw_cmn_set_video_timing(struct dsi_ctrl_hw *ctrl,
 				&pkt_per_line, &eol_byte_num);
 		reg = bytes_per_pkt << 16;
 		/* data type of compressed image */
-		reg |= (0x0b << 8);
+		datatype = mode->dsc->datatype;
+		if(!datatype) datatype = 0x0b;
+		reg |= (datatype << 8);
 		/*
 		 * pkt_per_line:
 		 * 0 == 1 pkt
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 3adbb9636c11..d2e132e36148 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3117,6 +3117,14 @@ static int dsi_panel_parse_dsc_params(struct dsi_display_mode *mode,
 	}
 	priv_info->dsc.config.bits_per_pixel = data << 4;
 
+	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-datatype",
+			&data);
+	if (rc) {
+		DSI_ERR("failed to parse qcom,mdss-dsc-datatype\n");
+		data = 0x0B;
+	}
+	priv_info->dsc.datatype = data;
+
 	rc = utils->read_u32(utils->data, "qcom,src-chroma-format",
 			&data);
 	if (rc) {
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index b69a2c7cec5a..60409a3010d1 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -400,6 +400,7 @@ struct msm_param_info {
  * @half_panel_pu            True for single and dual dsc encoders if partial
  *                           update sets the roi width to half of mode width
  *                           False in all other cases
+ * @datatype:                data type of compressed image
  */
 struct msm_display_dsc_info {
 	struct drm_dsc_config config;
@@ -422,6 +423,7 @@ struct msm_display_dsc_info {
 	u32 dsc_4hsmerge_padding;
 	u32 dsc_4hsmerge_alignment;
 	bool half_panel_pu;
+	int datatype;
 };
 
 

From acd105f3471f69faff91b8b75f5f8336d8dd1971 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Fri, 2 Jul 2021 21:25:18 +0800
Subject: [PATCH 081/116] dsi_panel: add  gpio to enable vsn/vsp

Use avdd_enable_gpio to enable avdd.
and Use avee_enable_gpio to enable avee.

Change-Id: I8b00588d6559e618fb4056957778d39448687b5c
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2001001
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 55 +++++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  3 +++
 2 files changed, 58 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index d2e132e36148..6f4a4aa9925e 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -215,10 +215,39 @@ static int dsi_panel_gpio_request(struct dsi_panel *panel)
 				 rc);
 			panel->panel_test_gpio = -1;
 			rc = 0;
+			goto error_release_panel_test;
 		}
 	}
 
+	if (gpio_is_valid(panel->avee_enable_gpio)) {
+		rc = gpio_request(panel->avee_enable_gpio, "avee_enable_gpio");
+		if (rc) {
+			DSI_WARN("request for avee_enable_gpio failed, rc=%d\n",
+				 rc);
+			panel->avee_enable_gpio = -1;
+			rc = 0;
+			goto error_release_avee_enable;
+		}
+	}
+
+	if (gpio_is_valid(panel->avdd_enable_gpio)) {
+		rc = gpio_request(panel->avdd_enable_gpio, "avdd_enable_gpio");
+		if (rc) {
+			DSI_WARN("request for avdd_enable_gpio failed, rc=%d\n",
+				 rc);
+			panel->avdd_enable_gpio = -1;
+			rc = 0;
+		}
+	}
+
+
 	goto error;
+error_release_avee_enable:
+	if (gpio_is_valid(panel->avee_enable_gpio))
+		gpio_free(panel->avee_enable_gpio);
+error_release_panel_test:
+	if (gpio_is_valid(panel->panel_test_gpio))
+		gpio_free(panel->panel_test_gpio);
 error_release_mode_sel:
 	if (gpio_is_valid(panel->bl_config.en_gpio))
 		gpio_free(panel->bl_config.en_gpio);
@@ -448,6 +477,18 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 
 	DSI_INFO("(%s)+\n", panel->name);
 
+	if (gpio_is_valid(panel->avdd_enable_gpio)) {
+		rc = gpio_direction_output(panel->avdd_enable_gpio, 1);
+		if (rc)
+			DSI_ERR("unable to set AVDD Enable gpio rc=%d\n", rc);
+	}
+
+	if (gpio_is_valid(panel->avee_enable_gpio)) {
+		rc = gpio_direction_output(panel->avee_enable_gpio, 1);
+		if (rc)
+			DSI_ERR("unable to set AVEE Enable gpio rc=%d\n", rc);
+	}
+
 	if ((panel->tp_state_check_enable) && (panel->tp_state)) {
 		pr_info("%s: (%s)+power is alway on \n", __func__, panel->name);
 		goto exit;
@@ -2721,6 +2762,20 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel)
 		DSI_DEBUG("%s:%d panel test gpio not specified\n", __func__,
 			 __LINE__);
 
+	panel->avee_enable_gpio = utils->get_named_gpio(utils->data,
+					"qcom,avee-enable-gpio",
+					0);
+	if (!gpio_is_valid(panel->avee_enable_gpio))
+		DSI_DEBUG("%s:%d qcom,avee-enable-gpio not specified\n", __func__,
+			 __LINE__);
+
+	panel->avdd_enable_gpio = utils->get_named_gpio(utils->data,
+					"qcom,avdd-enable-gpio",
+					0);
+	if (!gpio_is_valid(panel->avdd_enable_gpio))
+		DSI_DEBUG("%s:%d qcom,add-enable-gpio not specified\n", __func__,
+			 __LINE__);
+
 error:
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index d61e117bc6c5..bdeadbcec94e 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -372,6 +372,9 @@ struct dsi_panel {
 
 	int panel_recovery_retry;
 	bool is_panel_dead;
+
+	int avee_enable_gpio;
+	int avdd_enable_gpio;
 };
 
 bool dsi_display_all_displays_dead(void);

From fe176ce302a5ebe1a8291709c507677a9d17a10e Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Fri, 9 Jul 2021 14:22:43 +0800
Subject: [PATCH 082/116] msm/dsi: add support HBM with GPIO_DCS

For cypfq, we will set the backlight to max with dcs command.
And pull up hbm_en gpio to set the max current to 25mA.

Change-Id: I07885a122a9efc73e3f1191fa2465c0721ab9ec1
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2007805
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 58 ++++++++++++++++++++++++++++++++++++++++-----
 msm/dsi/dsi_panel.h |  2 ++
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 6f4a4aa9925e..27123a911a10 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -237,11 +237,24 @@ static int dsi_panel_gpio_request(struct dsi_panel *panel)
 				 rc);
 			panel->avdd_enable_gpio = -1;
 			rc = 0;
+			goto error_release_avdd_enable;
 		}
 	}
 
+	if (gpio_is_valid(panel->hbm_en_gpio)) {
+		rc = gpio_request(panel->hbm_en_gpio, "hbm_en_gpio");
+		if (rc) {
+			DSI_WARN("request for hbm_en_gpio failed, rc=%d\n",
+				 rc);
+			panel->hbm_en_gpio = -1;
+			rc = 0;
+		}
+	}
 
 	goto error;
+error_release_avdd_enable:
+	if (gpio_is_valid(panel->avdd_enable_gpio))
+		gpio_free(panel->avdd_enable_gpio);
 error_release_avee_enable:
 	if (gpio_is_valid(panel->avee_enable_gpio))
 		gpio_free(panel->avee_enable_gpio);
@@ -281,6 +294,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;
 }
 
@@ -1011,13 +1027,36 @@ 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);
+	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);
+			}
+			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);
+			}
+
+			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_set_backlight(panel, HBM_BRIGHTNESS(param_info->value));
-		if (rc)
-			DSI_ERR("unable to set backlight\n");
+		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;
@@ -2776,6 +2815,13 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel)
 		DSI_DEBUG("%s:%d qcom,add-enable-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_DEBUG("%s:%d HBM enable gpio not specified\n", __func__,
+			 __LINE__);
+
 error:
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index bdeadbcec94e..2c582bacdfd1 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -375,6 +375,8 @@ struct dsi_panel {
 
 	int avee_enable_gpio;
 	int avdd_enable_gpio;
+
+	int hbm_en_gpio;
 };
 
 bool dsi_display_all_displays_dead(void);

From e0977bd76c4799bb70a3242efcf29dfcdc97d5e6 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Thu, 22 Jul 2021 13:43:00 +0800
Subject: [PATCH 083/116] dsi_panel: remove avdd_enable and avee_enable gpios.

hange the default output voltage through I2C bus at XBL. And store the default
value to EEPROM. So we can nod make I2C operation at kernel.
Only pull up/down gpio to enable/disable regulator.
So use gpio regulator to control avee and avdd.

Change-Id: I5c9381c8304f0928ff215ac109c72eeda286cb00
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2020983
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 67 ++++++---------------------------------------
 msm/dsi/dsi_panel.h |  3 --
 2 files changed, 9 insertions(+), 61 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 27123a911a10..5c78b3e60114 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -204,7 +204,7 @@ static int dsi_panel_gpio_request(struct dsi_panel *panel)
 		rc = gpio_request(r_config->lcd_mode_sel_gpio, "mode_gpio");
 		if (rc) {
 			DSI_ERR("request for mode_gpio failed, rc=%d\n", rc);
-			goto error_release_mode_sel;
+			goto error_release_bl_en;
 		}
 	}
 
@@ -215,29 +215,7 @@ static int dsi_panel_gpio_request(struct dsi_panel *panel)
 				 rc);
 			panel->panel_test_gpio = -1;
 			rc = 0;
-			goto error_release_panel_test;
-		}
-	}
-
-	if (gpio_is_valid(panel->avee_enable_gpio)) {
-		rc = gpio_request(panel->avee_enable_gpio, "avee_enable_gpio");
-		if (rc) {
-			DSI_WARN("request for avee_enable_gpio failed, rc=%d\n",
-				 rc);
-			panel->avee_enable_gpio = -1;
-			rc = 0;
-			goto error_release_avee_enable;
-		}
-	}
-
-	if (gpio_is_valid(panel->avdd_enable_gpio)) {
-		rc = gpio_request(panel->avdd_enable_gpio, "avdd_enable_gpio");
-		if (rc) {
-			DSI_WARN("request for avdd_enable_gpio failed, rc=%d\n",
-				 rc);
-			panel->avdd_enable_gpio = -1;
-			rc = 0;
-			goto error_release_avdd_enable;
+			goto error_release_lcd_mode_sel;
 		}
 	}
 
@@ -248,20 +226,18 @@ static int dsi_panel_gpio_request(struct dsi_panel *panel)
 				 rc);
 			panel->hbm_en_gpio = -1;
 			rc = 0;
+			goto error_release_panel_test;
 		}
 	}
 
 	goto error;
-error_release_avdd_enable:
-	if (gpio_is_valid(panel->avdd_enable_gpio))
-		gpio_free(panel->avdd_enable_gpio);
-error_release_avee_enable:
-	if (gpio_is_valid(panel->avee_enable_gpio))
-		gpio_free(panel->avee_enable_gpio);
 error_release_panel_test:
 	if (gpio_is_valid(panel->panel_test_gpio))
 		gpio_free(panel->panel_test_gpio);
-error_release_mode_sel:
+error_release_lcd_mode_sel:
+	if (gpio_is_valid(r_config->lcd_mode_sel_gpio))
+		gpio_free(r_config->lcd_mode_sel_gpio);
+error_release_bl_en:
 	if (gpio_is_valid(panel->bl_config.en_gpio))
 		gpio_free(panel->bl_config.en_gpio);
 error_release_disp_en:
@@ -493,18 +469,6 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 
 	DSI_INFO("(%s)+\n", panel->name);
 
-	if (gpio_is_valid(panel->avdd_enable_gpio)) {
-		rc = gpio_direction_output(panel->avdd_enable_gpio, 1);
-		if (rc)
-			DSI_ERR("unable to set AVDD Enable gpio rc=%d\n", rc);
-	}
-
-	if (gpio_is_valid(panel->avee_enable_gpio)) {
-		rc = gpio_direction_output(panel->avee_enable_gpio, 1);
-		if (rc)
-			DSI_ERR("unable to set AVEE Enable gpio rc=%d\n", rc);
-	}
-
 	if ((panel->tp_state_check_enable) && (panel->tp_state)) {
 		pr_info("%s: (%s)+power is alway on \n", __func__, panel->name);
 		goto exit;
@@ -1031,7 +995,8 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 		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) {
+			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);
 			}
@@ -2801,20 +2766,6 @@ static int dsi_panel_parse_gpios(struct dsi_panel *panel)
 		DSI_DEBUG("%s:%d panel test gpio not specified\n", __func__,
 			 __LINE__);
 
-	panel->avee_enable_gpio = utils->get_named_gpio(utils->data,
-					"qcom,avee-enable-gpio",
-					0);
-	if (!gpio_is_valid(panel->avee_enable_gpio))
-		DSI_DEBUG("%s:%d qcom,avee-enable-gpio not specified\n", __func__,
-			 __LINE__);
-
-	panel->avdd_enable_gpio = utils->get_named_gpio(utils->data,
-					"qcom,avdd-enable-gpio",
-					0);
-	if (!gpio_is_valid(panel->avdd_enable_gpio))
-		DSI_DEBUG("%s:%d qcom,add-enable-gpio not specified\n", __func__,
-			 __LINE__);
-
 	panel->hbm_en_gpio = utils->get_named_gpio(utils->data,
 					"qcom,platform-hbm-en-gpio",
 					0);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 2c582bacdfd1..a28a6ad7b6af 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -373,9 +373,6 @@ struct dsi_panel {
 	int panel_recovery_retry;
 	bool is_panel_dead;
 
-	int avee_enable_gpio;
-	int avdd_enable_gpio;
-
 	int hbm_en_gpio;
 };
 

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

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

Change-Id: Iacb5d78c3a01874b21a3ceMontanafcc8362b1b03c29
Signed-off-by: daiss1 <daiss1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2041322
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_defs.h      |  5 ++++-
 msm/dsi/dsi_panel.c     | 35 ++++++++++++++++++++++++++++++++++-
 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, 60 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index d6893e028642..51807392221f 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -273,7 +273,8 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_CABC_DIS:                  CABC DIS mode
  * @DSI_CMD_SET_DFPS_CMD_90:               DFPS switch to 90
  * @DSI_CMD_SET_DFPS_CMD_60:               DFPS switch to 60
-
+ * @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 {
@@ -311,6 +312,8 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_CABC_DIS,
 	DSI_CMD_SET_DFPS_CMD_90,
 	DSI_CMD_SET_DFPS_CMD_60,
+	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 5c78b3e60114..c7c52832ad4a 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -81,6 +81,16 @@ static struct panel_param_val_map cabc_map_s[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_val_map dc_map_s[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,
@@ -88,7 +98,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}
 	},
 	{
 		{"HBM", hbm_map_s, HBM_STATE_NUM, HBM_OFF_STATE,
@@ -97,6 +109,8 @@ static struct panel_param dsi_panel_param[PANEL_IDX_MAX][PARAM_ID_NUM] = {
 				ACL_OFF_STATE, false},
 		{"CABC", cabc_map_s, CABC_STATE_NUM, CABC_UI_STATE,
 				CABC_UI_STATE, false},
+		{"DC", dc_map_s, DC_STATE_NUM, DC_OFF_STATE,
+			DC_OFF_STATE, false}
 	}
 };
 
@@ -1053,6 +1067,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)
 {
@@ -1074,6 +1101,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",
@@ -2214,6 +2243,8 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-cabc-dis-command",
 	"qcom,mdss-dsi-dfps-90-command",
 	"qcom,mdss-dsi-dfps-60-command",
+	"qcom,mdss-dsi-dc-on-command",
+	"qcom,mdss-dsi-dc-off-command",
 };
 
 const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
@@ -2251,6 +2282,8 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-cabc-dis-command-state",
 	"qcom,mdss-dsi-dfps-90-command-state",
 	"qcom,mdss-dsi-dfps-60-command-state",
+	"qcom,mdss-dsi-dc-on-command-state",
+	"qcom,mdss-dsi-dc-off-command-state",
 };
 
 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 a28a6ad7b6af..71d28a2c99d5 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -245,6 +245,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 60409a3010d1..5288daada136 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -220,6 +220,7 @@ enum msm_mdp_conn_property {
 	CONNECTOR_PROP_HBM,
 	CONNECTOR_PROP_CABC,
 	CONNECTOR_PROP_ACL,
+	CONNECTOR_PROP_DC,
 	/* total # of properties */
 	CONNECTOR_PROP_COUNT
 };
@@ -368,6 +369,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 8b5897ebf4e0..42dbfcd648f6 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1589,6 +1589,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;
 	}
@@ -2689,6 +2697,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 83a97f26b2428dfdd37fba923d30e2b87ffa30a1 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Mon, 15 Jun 2020 17:42:36 +0800
Subject: [PATCH 085/116] 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
Signed-off-by: tanhua1 <tanhua1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1949835
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Reviewed-on: https://gerrit.mot.com/2045804
Reviewed-by: Zhihong Kang <kangzh@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
---
 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 c7c52832ad4a..d3fd0c6fcd81 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -856,6 +856,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;
@@ -878,6 +884,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:
@@ -1139,6 +1149,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:
@@ -1176,6 +1188,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:
@@ -2905,6 +2919,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 71d28a2c99d5..e8d1dc76d778 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -82,6 +82,7 @@ enum dsi_backlight_type {
 	DSI_BACKLIGHT_DCS,
 	DSI_BACKLIGHT_DUMMY,
 	DSI_BACKLIGHT_EXTERNAL,
+	DSI_BACKLIGHT_I2C,
 	DSI_BACKLIGHT_UNKNOWN,
 	DSI_BACKLIGHT_MAX,
 };

From 4222fb1b3d1de4766704020ea7a27ea07cb35119 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Wed, 1 Jul 2020 11:53:42 +0800
Subject: [PATCH 086/116] 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
Signed-off-by: tanhua1 <tanhua1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1949836
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Reviewed-on: https://gerrit.mot.com/2046088
Reviewed-by: Zhihong Kang <kangzh@motorola.com>
---
 msm/dsi/dsi_panel.c | 11 ++++++-----
 msm/dsi/dsi_panel.h |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index d3fd0c6fcd81..ec59e43a83ef 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -857,10 +857,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);
@@ -874,6 +874,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;
@@ -885,8 +886,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 e8d1dc76d778..7ee0cb0888ac 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -172,7 +172,8 @@ struct dsi_backlight_config {
 	/* WLED params */
 	struct led_trigger *wled;
 	struct backlight_device *raw_bd;
-
+	struct backlight_device *i2c_bd;
+	
 	/* DCS params */
 	bool lp_mode;
 };

From 3df694663724051e2e20abbd935cdbed2b0a4f17 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Tue, 24 Aug 2021 17:48:18 +0800
Subject: [PATCH 087/116] drm/dsi: add keeep panel regulators always on
 function

drm/dsi:
Add keep panel regulators always on function when screen on/off.

Change-Id: I88e045237a149b9c4b2f908b334aa52b0c75f3be
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2049656
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 32 ++++++++++++++++++++++----------
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index ec59e43a83ef..3b91987ec417 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -488,11 +488,13 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 		goto exit;
 	}
 
-	rc = dsi_pwr_enable_regulator(&panel->power_info, true);
-	if (rc) {
-		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
-				panel->name, rc);
-		goto exit;
+	if (!panel->keep_regulators_on) {
+		rc = dsi_pwr_enable_regulator(&panel->power_info, true);
+		if (rc) {
+			DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
+					panel->name, rc);
+			goto exit;
+		}
 	}
 
 	rc = dsi_panel_set_pinctrl_state(panel, true);
@@ -504,7 +506,8 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 	goto exit;
 
 error_disable_vregs:
-	(void)dsi_pwr_enable_regulator(&panel->power_info, false);
+	if (!panel->keep_regulators_on)
+		(void)dsi_pwr_enable_regulator(&panel->power_info, false);
 
 exit:
 	return rc;
@@ -550,10 +553,12 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 		       rc);
 	}
 
-	rc = dsi_pwr_enable_regulator(&panel->power_info, false);
-	if (rc)
-		DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
-				panel->name, rc);
+	if (!panel->keep_regulators_on) {
+		rc = dsi_pwr_enable_regulator(&panel->power_info, false);
+		if (rc)
+			DSI_ERR("[%s] failed to enable vregs, rc=%d\n",
+					panel->name, rc);
+	}
 
 exit:
 	return rc;
@@ -2678,6 +2683,7 @@ static int dsi_panel_parse_power_cfg(struct dsi_panel *panel)
 {
 	int rc = 0;
 	char *supply_name;
+	struct dsi_parser_utils *utils = &panel->utils;
 
 	if (panel->host_config.ext_bridge_mode)
 		return 0;
@@ -2694,6 +2700,12 @@ static int dsi_panel_parse_power_cfg(struct dsi_panel *panel)
 		goto error;
 	}
 
+	panel->keep_regulators_on = utils->read_bool(utils->data,
+			"qcom,keep-regulators-on");
+
+	DSI_DEBUG("[%s] keep_regulators_on=%d\n", panel->name,
+			panel->keep_regulators_on);
+
 error:
 	return rc;
 }
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 7ee0cb0888ac..9016b3da25f0 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -351,6 +351,7 @@ struct dsi_panel {
 
 	int panel_test_gpio;
 	int power_mode;
+	bool keep_regulators_on;
 	enum dsi_panel_physical_type panel_type;
 
 	struct dsi_tlmm_gpio *tlmm_gpio;

From cf526d3224460b047f9e9794ec75c6e0935e1ccb Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Fri, 10 Sep 2021 11:37:57 +0800
Subject: [PATCH 088/116] msm/dsi: add shutdown function to power down panel

When shut down phone, it will call shutdown function to shut down device.
That can meet the power down timing requirements of panel.

Change-Id: If5f5eb57934559d8c6aa979431d434bf89d33de9
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2063775
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_display.c | 46 +++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_display.h |  1 +
 msm/dsi/dsi_panel.c   |  3 +++
 msm/dsi/dsi_panel.h   |  1 +
 4 files changed, 51 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 5fdc05795d19..4bbcf367ffe9 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -6406,8 +6406,54 @@ static struct platform_driver dsi_display_driver = {
 		.of_match_table = dsi_display_dt_match,
 		.suppress_bind_attrs = true,
 	},
+	.shutdown = dsi_display_dev_shutdown,
 };
 
+void dsi_display_dev_shutdown(struct platform_device *pdev)
+{
+	int rc = 0;
+	struct dsi_display *display;
+	struct dsi_panel *panel;
+
+	if (!pdev) {
+		DSI_ERR("Invalid device\n");
+		return;
+	}
+
+	display = platform_get_drvdata(pdev);
+
+	if (display == NULL || display->panel == NULL) {
+		DSI_ERR("Invalid device\n");
+		return;
+	}
+
+	panel = display->panel;
+
+	if (!panel->need_execute_shutdown) {
+		return;
+	}
+
+	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))
+		gpio_set_value(panel->reset_config.reset_gpio, 0);
+
+	if (gpio_is_valid(panel->reset_config.lcd_mode_sel_gpio))
+		gpio_set_value(panel->reset_config.lcd_mode_sel_gpio, 0);
+
+	if (gpio_is_valid(panel->panel_test_gpio)) {
+		rc = gpio_direction_input(panel->panel_test_gpio);
+		if (rc)
+			DSI_WARN("set dir for panel test gpio failed rc=%d\n", rc);
+	}
+
+	rc = dsi_pwr_enable_regulator(&panel->power_info, false);
+	if (rc)
+		DSI_ERR("[%s] failed to enable vregs, rc=%d\n", panel->name, rc);
+
+}
+
 static int dsi_display_init(struct dsi_display *display)
 {
 	int rc = 0;
diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h
index f8d67ac8759f..3c8e7a5ec36e 100644
--- a/msm/dsi/dsi_display.h
+++ b/msm/dsi/dsi_display.h
@@ -308,6 +308,7 @@ struct dsi_display {
 
 int dsi_display_dev_probe(struct platform_device *pdev);
 int dsi_display_dev_remove(struct platform_device *pdev);
+void dsi_display_dev_shutdown(struct platform_device *pdev);
 
 /**
  * dsi_display_get_num_of_displays() - returns number of display devices
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 3b91987ec417..a9ccf8db0b16 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2609,6 +2609,9 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 	panel->skip_panel_off = utils->read_bool(utils->data,
 			"qcom,skip-panel-power-off");
 
+	panel->need_execute_shutdown = utils->read_bool(utils->data,
+			"qcom,platform-need-execute-shutdown");
+
 	panel->spr_info.enable = false;
 	panel->spr_info.pack_type = MSM_DISPLAY_SPR_TYPE_MAX;
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 9016b3da25f0..8fd611f63701 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -332,6 +332,7 @@ struct dsi_panel {
 	bool ulps_suspend_enabled;
 	bool allow_phy_power_off;
 	bool reset_gpio_always_on;
+	bool need_execute_shutdown;
 	atomic_t esd_recovery_pending;
 
 	bool is_twm_en;

From 1e339b7f38915fa73a41824b83852c8c2a0da445 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Wed, 22 Dec 2021 22:09:09 +0800
Subject: [PATCH 089/116] 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.
MTK changes: https://gerrit.mot.com/#/c/2097095/

Change-Id: Ic5b6945e1eb7c905658dfe58e6dca18a0bfeb2e9
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2152146
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_defs.h  | 14 +++++++++++
 msm/dsi/dsi_panel.c | 60 +++++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  2 ++
 3 files changed, 76 insertions(+)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 51807392221f..630a6a2a43cd 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -275,6 +275,13 @@ enum dsi_dyn_clk_feature_type {
  * @DSI_CMD_SET_DFPS_CMD_60:               DFPS switch to 60
  * @DSI_CMD_SET_DC_ON:                    DC mode on
  * @DSI_CMD_SET_DC_OFF:                   DC mode off
+ * @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 {
@@ -314,6 +321,13 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_DFPS_CMD_60,
 	DSI_CMD_SET_DC_ON,
 	DSI_CMD_SET_DC_OFF,
+	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 a9ccf8db0b16..d871ba0d5bcd 100644
--- 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,
 	struct mipi_dsi_device *dsi = NULL;
 	struct dsi_backlight_config *bl = &panel->bl_config;
 	u32 bl_lvl_2bytes;
+	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;
 	if (unlikely(panel->bl_config.lp_mode)) {
@@ -721,6 +724,43 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 
 	if (unlikely(panel->bl_config.lp_mode))
 		dsi->mode_flags = mode_flags;
+	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;
 }
@@ -2265,6 +2305,13 @@ const char *cmd_set_prop_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-dfps-60-command",
 	"qcom,mdss-dsi-dc-on-command",
 	"qcom,mdss-dsi-dc-off-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] = {
@@ -2304,6 +2351,13 @@ const char *cmd_set_state_map[DSI_CMD_SET_MAX] = {
 	"qcom,mdss-dsi-dfps-60-command-state",
 	"qcom,mdss-dsi-dc-on-command-state",
 	"qcom,mdss-dsi-dc-off-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",
 };
 
 int dsi_panel_get_cmd_pkt_count(const char *data, u32 length, u32 *cnt)
@@ -3012,6 +3066,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 8fd611f63701..e98564ed5321 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -162,6 +162,8 @@ struct dsi_backlight_config {
 	u32 bl_scale;
 	u32 bl_scale_sv;
 	bool bl_inverted_dbv;
+	bool bl_demura_cmd;
+	u32 demura_type;
 
 	int en_gpio;
 	/* PWM params */

From b307571af91756f75a94bbb87f76e7d6707647df Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Tue, 4 Jan 2022 09:29:10 +0800
Subject: [PATCH 090/116] msm/dsi: phy_v3.0: get strength volue of phy from
 dtsi

Some project need to change the strength volue of phy,
to fix the RF issue.So we can define the strength at the panel dtsi file.

Change-Id: I9b3fb6e741798ac6ef5ec3921875a9975ce88e9f
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2160545
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_phy_hw_v3_0.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/msm/dsi/dsi_phy_hw_v3_0.c b/msm/dsi/dsi_phy_hw_v3_0.c
index 4b8992bc07c3..a73c89f537a5 100644
--- a/msm/dsi/dsi_phy_hw_v3_0.c
+++ b/msm/dsi/dsi_phy_hw_v3_0.c
@@ -185,6 +185,12 @@ static void dsi_phy_hw_v3_0_lane_settings(struct dsi_phy_hw *phy,
 		DSI_W32(phy, DSIPHY_LNX_LPRX_CTRL(i), 0);
 		DSI_W32(phy, DSIPHY_LNX_PIN_SWAP(i), 0x0);
 		DSI_W32(phy, DSIPHY_LNX_HSTX_STR_CTRL(i), 0x88);
+		if(cfg->phy_drive_strength) {
+			DSI_W32(phy, DSIPHY_LNX_HSTX_STR_CTRL(i), cfg->phy_drive_strength);
+			DSI_PHY_WARN(phy, "DSIPHY_LNX_HSTX_STR_CTRL of lane%d is rewrite to 0x%x from 0x88\n",
+				i, cfg->phy_drive_strength);
+		}
+
 	}
 	dsi_phy_hw_v3_0_config_lpcdrx(phy, cfg, true);
 

From c36f5439e80c808a030e59a850e97a0b072ed715 Mon Sep 17 00:00:00 2001
From: zhangly19 <zhangly19@lenovo.com>
Date: Mon, 14 Feb 2022 15:18:57 +0800
Subject: [PATCH 091/116] Revert "disp: msm: dsi: Support uncompressed
 rgb101010 format"

This commit caused Rhode5G+ display issue

This reverts commit c56edb2f47142582b616621bb7e2577e023f2131.

Change-Id: I5779fb1b92ac00c386c286760bf5dc38a8157ac5
Reviewed-on: https://gerrit.mot.com/2189888
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Tested-by: Jira Key
Submit-Approved: Liyun Zhang <zhangly19@lenovo.com>
---
 msm/dsi/dsi_ctrl.c            |  3 ---
 msm/dsi/dsi_ctrl_hw_cmn.c     | 13 +++++--------
 msm/dsi/dsi_defs.h            |  4 ----
 msm/dsi/dsi_phy_timing_calc.c |  4 ++--
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/msm/dsi/dsi_ctrl.c b/msm/dsi/dsi_ctrl.c
index 278e3dcbe921..3336ec91780a 100644
--- a/msm/dsi/dsi_ctrl.c
+++ b/msm/dsi/dsi_ctrl.c
@@ -931,9 +931,6 @@ int dsi_ctrl_pixel_format_to_bpp(enum dsi_pixel_format dst_format)
 	case DSI_PIXEL_FORMAT_RGB888:
 		bpp = 24;
 		break;
-	case DSI_PIXEL_FORMAT_RGB101010:
-		bpp = 30;
-		break;
 	default:
 		bpp = 24;
 		break;
diff --git a/msm/dsi/dsi_ctrl_hw_cmn.c b/msm/dsi/dsi_ctrl_hw_cmn.c
index 50dc8a060463..ce7d72c18439 100644
--- a/msm/dsi/dsi_ctrl_hw_cmn.c
+++ b/msm/dsi/dsi_ctrl_hw_cmn.c
@@ -42,9 +42,9 @@ static bool dsi_compression_enabled(struct dsi_mode_info *mode)
 
 /* Unsupported formats default to RGB888 */
 static const u8 cmd_mode_format_map[DSI_PIXEL_FORMAT_MAX] = {
-	0x6, 0x7, 0x8, 0x8, 0x0, 0x3, 0x4, 0x9 };
+	0x6, 0x7, 0x8, 0x8, 0x0, 0x3, 0x4 };
 static const u8 video_mode_format_map[DSI_PIXEL_FORMAT_MAX] = {
-	0x0, 0x1, 0x2, 0x3, 0x3, 0x3, 0x3, 0x4 };
+	0x0, 0x1, 0x2, 0x3, 0x3, 0x3, 0x3 };
 
 /**
  * dsi_split_link_setup() - setup dsi split link configurations
@@ -431,13 +431,10 @@ void dsi_ctrl_hw_cmn_setup_cmd_stream(struct dsi_ctrl_hw *ctrl,
 	u32 reg = 0, offset = 0;
 	int pic_width = 0, this_frame_slices = 0, intf_ip_w = 0;
 	u32 pkt_per_line = 0, eol_byte_num = 0, bytes_in_slice = 0;
-	u32 bpp;
 
 	if (roi && (!roi->w || !roi->h))
 		return;
 
-	bpp = dsi_pixel_format_to_bpp(cfg->dst_format);
-
 	if (dsi_dsc_compression_enabled(mode)) {
 		struct msm_display_dsc_info dsc;
 
@@ -471,11 +468,11 @@ void dsi_ctrl_hw_cmn_setup_cmd_stream(struct dsi_ctrl_hw *ctrl,
 		bytes_in_slice = vdc.bytes_in_slice;
 	} else if (roi) {
 		width_final = roi->w;
-		stride_final = DIV_ROUND_UP(roi->w * bpp, 8);
+		stride_final = roi->w * 3;
 		height_final = roi->h;
 	} else {
 		width_final = mode->h_active;
-		stride_final = DIV_ROUND_UP(mode->h_active * bpp, 8);
+		stride_final = mode->h_active * 3;
 		height_final = mode->v_active;
 	}
 
@@ -592,7 +589,7 @@ void dsi_ctrl_hw_cmn_video_engine_setup(struct dsi_ctrl_hw *ctrl,
 	reg |= (cfg->bllp_lp11_en ? BIT(12) : 0);
 	reg |= (cfg->traffic_mode & 0x3) << 8;
 	reg |= (cfg->vc_id & 0x3);
-	reg |= (video_mode_format_map[common_cfg->dst_format] & 0x7) << 4;
+	reg |= (video_mode_format_map[common_cfg->dst_format] & 0x3) << 4;
 	DSI_W32(ctrl, DSI_VIDEO_MODE_CTRL, reg);
 
 	reg = (common_cfg->swap_mode & 0x7) << 12;
diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 630a6a2a43cd..628ef705693e 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -39,7 +39,6 @@
  * @DSI_PIXEL_FORMAT_RGB111:
  * @DSI_PIXEL_FORMAT_RGB332:
  * @DSI_PIXEL_FORMAT_RGB444:
- * @DSI_PIXEL_FORMAT_RGB101010:
  * @DSI_PIXEL_FORMAT_MAX:
  */
 enum dsi_pixel_format {
@@ -50,7 +49,6 @@ enum dsi_pixel_format {
 	DSI_PIXEL_FORMAT_RGB111,
 	DSI_PIXEL_FORMAT_RGB332,
 	DSI_PIXEL_FORMAT_RGB444,
-	DSI_PIXEL_FORMAT_RGB101010,
 	DSI_PIXEL_FORMAT_MAX
 };
 
@@ -783,8 +781,6 @@ static inline int dsi_pixel_format_to_bpp(enum dsi_pixel_format fmt)
 		return 8;
 	case DSI_PIXEL_FORMAT_RGB444:
 		return 12;
-	case DSI_PIXEL_FORMAT_RGB101010:
-		return 30;
 	}
 	return 24;
 }
diff --git a/msm/dsi/dsi_phy_timing_calc.c b/msm/dsi/dsi_phy_timing_calc.c
index 6efc8d781265..6e2a625a3572 100644
--- a/msm/dsi/dsi_phy_timing_calc.c
+++ b/msm/dsi/dsi_phy_timing_calc.c
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
  */
 
 #include "dsi_phy_timing_calc.h"
 
 static const u32 bits_per_pixel[DSI_PIXEL_FORMAT_MAX] = {
-	16, 18, 18, 24, 3, 8, 12, 30 };
+	16, 18, 18, 24, 3, 8, 12 };
 
 static int dsi_phy_cmn_validate_and_set(struct timing_entry *t,
 	char const *t_name)

From 4b99996f2034c3ef9d0d60d98d7ed582a92891b5 Mon Sep 17 00:00:00 2001
From: houdz1 <houdz1@lenovo.com>
Date: Fri, 18 Feb 2022 10:20:55 +0800
Subject: [PATCH 092/116] Revert "(CR) Revert "disp: msm: dsi: Support
 uncompressed rgb101010 format""

This reverts commit a4009b4f3de5134a2e2e71d15dfae627b942d72c.
Qcom has the format patch , so we revert this workaround solution.
Mot-CRs-fixed: (CR)

Change-Id: I3c5e94d8a8d5b408f49a69b8d2fdc77a38cc4ed8
Signed-off-by: houdz1 <houdz1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2193964
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Zhihong Kang <kangzh@motorola.com>
Reviewed-by: Liyun Zhang <zhangly19@lenovo.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Hujun Liao <liaohj@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_ctrl.c            |  3 +++
 msm/dsi/dsi_ctrl_hw_cmn.c     | 13 ++++++++-----
 msm/dsi/dsi_defs.h            |  4 ++++
 msm/dsi/dsi_phy_timing_calc.c |  4 ++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/msm/dsi/dsi_ctrl.c b/msm/dsi/dsi_ctrl.c
index 3336ec91780a..278e3dcbe921 100644
--- a/msm/dsi/dsi_ctrl.c
+++ b/msm/dsi/dsi_ctrl.c
@@ -931,6 +931,9 @@ int dsi_ctrl_pixel_format_to_bpp(enum dsi_pixel_format dst_format)
 	case DSI_PIXEL_FORMAT_RGB888:
 		bpp = 24;
 		break;
+	case DSI_PIXEL_FORMAT_RGB101010:
+		bpp = 30;
+		break;
 	default:
 		bpp = 24;
 		break;
diff --git a/msm/dsi/dsi_ctrl_hw_cmn.c b/msm/dsi/dsi_ctrl_hw_cmn.c
index ce7d72c18439..50dc8a060463 100644
--- a/msm/dsi/dsi_ctrl_hw_cmn.c
+++ b/msm/dsi/dsi_ctrl_hw_cmn.c
@@ -42,9 +42,9 @@ static bool dsi_compression_enabled(struct dsi_mode_info *mode)
 
 /* Unsupported formats default to RGB888 */
 static const u8 cmd_mode_format_map[DSI_PIXEL_FORMAT_MAX] = {
-	0x6, 0x7, 0x8, 0x8, 0x0, 0x3, 0x4 };
+	0x6, 0x7, 0x8, 0x8, 0x0, 0x3, 0x4, 0x9 };
 static const u8 video_mode_format_map[DSI_PIXEL_FORMAT_MAX] = {
-	0x0, 0x1, 0x2, 0x3, 0x3, 0x3, 0x3 };
+	0x0, 0x1, 0x2, 0x3, 0x3, 0x3, 0x3, 0x4 };
 
 /**
  * dsi_split_link_setup() - setup dsi split link configurations
@@ -431,10 +431,13 @@ void dsi_ctrl_hw_cmn_setup_cmd_stream(struct dsi_ctrl_hw *ctrl,
 	u32 reg = 0, offset = 0;
 	int pic_width = 0, this_frame_slices = 0, intf_ip_w = 0;
 	u32 pkt_per_line = 0, eol_byte_num = 0, bytes_in_slice = 0;
+	u32 bpp;
 
 	if (roi && (!roi->w || !roi->h))
 		return;
 
+	bpp = dsi_pixel_format_to_bpp(cfg->dst_format);
+
 	if (dsi_dsc_compression_enabled(mode)) {
 		struct msm_display_dsc_info dsc;
 
@@ -468,11 +471,11 @@ void dsi_ctrl_hw_cmn_setup_cmd_stream(struct dsi_ctrl_hw *ctrl,
 		bytes_in_slice = vdc.bytes_in_slice;
 	} else if (roi) {
 		width_final = roi->w;
-		stride_final = roi->w * 3;
+		stride_final = DIV_ROUND_UP(roi->w * bpp, 8);
 		height_final = roi->h;
 	} else {
 		width_final = mode->h_active;
-		stride_final = mode->h_active * 3;
+		stride_final = DIV_ROUND_UP(mode->h_active * bpp, 8);
 		height_final = mode->v_active;
 	}
 
@@ -589,7 +592,7 @@ void dsi_ctrl_hw_cmn_video_engine_setup(struct dsi_ctrl_hw *ctrl,
 	reg |= (cfg->bllp_lp11_en ? BIT(12) : 0);
 	reg |= (cfg->traffic_mode & 0x3) << 8;
 	reg |= (cfg->vc_id & 0x3);
-	reg |= (video_mode_format_map[common_cfg->dst_format] & 0x3) << 4;
+	reg |= (video_mode_format_map[common_cfg->dst_format] & 0x7) << 4;
 	DSI_W32(ctrl, DSI_VIDEO_MODE_CTRL, reg);
 
 	reg = (common_cfg->swap_mode & 0x7) << 12;
diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 628ef705693e..630a6a2a43cd 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -39,6 +39,7 @@
  * @DSI_PIXEL_FORMAT_RGB111:
  * @DSI_PIXEL_FORMAT_RGB332:
  * @DSI_PIXEL_FORMAT_RGB444:
+ * @DSI_PIXEL_FORMAT_RGB101010:
  * @DSI_PIXEL_FORMAT_MAX:
  */
 enum dsi_pixel_format {
@@ -49,6 +50,7 @@ enum dsi_pixel_format {
 	DSI_PIXEL_FORMAT_RGB111,
 	DSI_PIXEL_FORMAT_RGB332,
 	DSI_PIXEL_FORMAT_RGB444,
+	DSI_PIXEL_FORMAT_RGB101010,
 	DSI_PIXEL_FORMAT_MAX
 };
 
@@ -781,6 +783,8 @@ static inline int dsi_pixel_format_to_bpp(enum dsi_pixel_format fmt)
 		return 8;
 	case DSI_PIXEL_FORMAT_RGB444:
 		return 12;
+	case DSI_PIXEL_FORMAT_RGB101010:
+		return 30;
 	}
 	return 24;
 }
diff --git a/msm/dsi/dsi_phy_timing_calc.c b/msm/dsi/dsi_phy_timing_calc.c
index 6e2a625a3572..6efc8d781265 100644
--- a/msm/dsi/dsi_phy_timing_calc.c
+++ b/msm/dsi/dsi_phy_timing_calc.c
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
  */
 
 #include "dsi_phy_timing_calc.h"
 
 static const u32 bits_per_pixel[DSI_PIXEL_FORMAT_MAX] = {
-	16, 18, 18, 24, 3, 8, 12 };
+	16, 18, 18, 24, 3, 8, 12, 30 };
 
 static int dsi_phy_cmn_validate_and_set(struct timing_entry *t,
 	char const *t_name)

From 73f16f7298019e9f296e6f943c0d2b44090fd9f4 Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@motorola.com>
Date: Wed, 30 Mar 2022 10:43:18 +0800
Subject: [PATCH 093/116] display: support local hbm alpha configuration of
 panel

The configuration of the mask aplha of the local hbm
is based on the DBV level to ensure that the brightness
of local hbm on or off is consistent.

Change-Id: I68a7a233a27549db0582a6f07d7a421ed400f3d2
Signed-off-by: tanhua1 <tanhua1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2238455
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 158 +++++++++++++++++++++++++++++++++++++++++++-
 msm/dsi/dsi_panel.h |  10 +++
 2 files changed, 167 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index d871ba0d5bcd..dcb08e054124 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -885,6 +885,11 @@ int dsi_panel_set_backlight(struct dsi_panel *panel, u32 bl_lvl)
 	if (dsi_panel_set_hbm_backlight(panel, &bl_lvl))
 		return 0;
 
+	if(panel->lhbm_config.enable) {
+		panel->lhbm_config.dbv_level = bl_lvl;
+		DSI_INFO("backlight type:%d dbv lvl:%d\n", bl->type, bl_lvl);
+	}
+
 	DSI_DEBUG("backlight type:%d lvl:%d\n", bl->type, bl_lvl);
 	switch (bl->type) {
 	case DSI_BACKLIGHT_WLED:
@@ -1054,10 +1059,89 @@ end:
 	return rc;
 };
 
+static int dsi_panel_set_local_hbm_param(struct dsi_panel *panel,
+                        struct msm_param_info *param_info,
+                        struct dsi_panel_lhbm_config *lhbm_config)
+{
+	int rc = 0, count = 0, i;
+	int alpha = 0;
+	u8 *payload;
+	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;
+
+
+	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;
+
+	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)
+	{
+		rc =  0;
+		goto end;
+	} else {
+		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;
+		count = param_map_state->cmds->count;
+
+		for (i =0; i < count; i++) {
+			payload = (u8 *)cmds->msg.tx_buf;
+			if(param_info->value == HBM_FOD_ON_STATE &&
+				payload[0] == lhbm_config->alpha_reg) {
+				if(lhbm_config->dbv_level >lhbm_config->alpha_size) {
+					DSI_ERR("unsupport dbv level %d on local hbm\n", lhbm_config->dbv_level);
+					rc = -EINVAL;
+					goto end;
+				}
+
+				alpha = lhbm_config->alpha[lhbm_config->dbv_level];
+				payload[1] = (alpha&0xff00)>>8;
+				payload[2] = alpha&0xff;
+				DSI_INFO("%s: alpha [%x]=%x%x\n",
+				        __func__, payload[0], payload[1], payload[2]);
+				rc =  0;
+				goto end;
+			} else if(param_info->value == HBM_OFF_STATE &&
+				payload[0] == 0x51) {
+				payload[1] = (lhbm_config->dbv_level&0xff00)>>8;
+				payload[2] = lhbm_config->dbv_level&0xff;
+				DSI_INFO("%s: restore backlight level=%d\n",
+				        __func__, lhbm_config->dbv_level);
+				rc =  0;
+				goto end;
+			}
+			cmds++;
+		}
+	}
+
+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;
+	u32 bl_lvl;
+	struct dsi_panel_lhbm_config *lhbm_config = &panel->lhbm_config;
 
 	pr_info("Set HBM to (%d)\n", param_info->value);
 
@@ -1084,11 +1168,19 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 			rc = -EINVAL;
 		}
 	} else {
+		if(lhbm_config->enable && param_info->value != HBM_ON_STATE) {
+			dsi_panel_set_local_hbm_param(panel, param_info, lhbm_config);
+		}
+
 		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(lhbm_config->enable)
+				bl_lvl = lhbm_config->dbv_level;
+			else
+				bl_lvl = HBM_BRIGHTNESS(param_info->value);
+			rc = dsi_panel_set_backlight(panel, bl_lvl);
 			if (rc)
 				DSI_ERR("unable to set backlight\n");
 		}
@@ -4085,6 +4177,66 @@ error:
 	return rc;
 }
 
+static int dsi_panel_parse_local_hbm_config(struct dsi_panel *panel)
+{
+	int rc = 0;
+	u32 size;
+	struct dsi_panel_lhbm_config *lhbm_config;
+	struct dsi_parser_utils *utils = &panel->utils;
+
+	lhbm_config = &panel->lhbm_config;
+	lhbm_config->enable = utils->read_bool(utils->data,
+		"qcom,mdss-dsi-panel-local-hbm-enabled");
+
+	if (lhbm_config->enable) {
+		rc = utils->read_u32(utils->data,
+			"qcom,mdss-dsi-panel-local-hbm-alpha-size",
+			&(lhbm_config->alpha_size));
+		if (rc) {
+			DSI_ERR("%s:%d, Unable to read local hbm alpha size, rc:%u\n",
+				__func__, __LINE__, rc);
+			lhbm_config->enable = false;
+			return rc;
+		}
+
+		size = lhbm_config->alpha_size * sizeof(u32);
+
+		lhbm_config->alpha = kzalloc(size, GFP_KERNEL);
+		if (!lhbm_config->alpha) {
+			rc = -ENOMEM;
+			DSI_ERR("%s:%d, no memory for local hbm alpha table, rc:%u\n",
+				__func__, __LINE__, rc);
+			lhbm_config->enable = false;
+			return rc;
+		}
+
+		rc = utils->read_u32_array(utils->data,
+				"qcom,mdss-dsi-panel-local-hbm-alpha-table",
+				lhbm_config->alpha,
+				lhbm_config->alpha_size);
+		if (rc) {
+			DSI_ERR("%s:%d, Unable to read local hbm alpha table,rc:%u\n",
+					__func__, __LINE__, rc);
+			lhbm_config->enable = false;
+			return rc;
+		}
+
+		rc = utils->read_u32(utils->data,
+			"qcom,mdss-dsi-panel-local-hbm-alpha-register",
+			&(lhbm_config->alpha_reg));
+		if (rc) {
+			DSI_ERR("%s:%d, Unable to read local hbm register, rc:%u\n",
+				__func__, __LINE__, rc);
+			lhbm_config->enable = false;
+			return rc;
+		}
+	} else {
+		DSI_INFO("%s:%d, no local hbm config\n",
+				__func__, __LINE__);
+	}
+	return 0;
+}
+
 static void dsi_panel_update_util(struct dsi_panel *panel,
 				  struct device_node *parser_node)
 {
@@ -4446,6 +4598,10 @@ struct dsi_panel *dsi_panel_get(struct device *parent,
 	if (rc)
 		DSI_DEBUG("failed to parse esd config, rc=%d\n", rc);
 
+	rc = dsi_panel_parse_local_hbm_config(panel);
+	if (rc)
+		DSI_DEBUG("failed to parse local hbm config, rc=%d\n", rc);
+
 	rc = dsi_panel_vreg_get(panel);
 	if (rc) {
 		DSI_ERR("[%s] failed to get panel regulators, rc=%d\n",
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index e98564ed5321..26066cd5ca80 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -223,6 +223,14 @@ struct dsi_panel_spr_info {
 	enum msm_display_spr_pack_type pack_type;
 };
 
+struct dsi_panel_lhbm_config {
+	bool enable;
+	u32 dbv_level;
+	u32 alpha_reg;
+	u32 alpha_size;
+	u32 *alpha;
+};
+
 enum panel_idx {
 	MAIN_IDX = 0,
 	SEC_INX,
@@ -327,6 +335,8 @@ struct dsi_panel {
 	struct drm_panel_hdr_properties hdr_props;
 	struct drm_panel_esd_config esd_config;
 
+	struct dsi_panel_lhbm_config lhbm_config;
+
 	struct dsi_parser_utils utils;
 
 	bool lp11_init;

From 25c2a63dd5e6497881e80902925d77f517312b79 Mon Sep 17 00:00:00 2001
From: wingte48 <wingte48@motorola.com>
Date: Wed, 2 Mar 2022 16:13:13 +0800
Subject: [PATCH 094/116] kernel/display : Add dsi pps disable configuration
 function

Modify:
  some panel ICs can't decode platform pps code, use panel's own pps
parameters.So add this feature do disable platform sent pps.

Change-Id: I95926e86f12c3486aa3ebc684a872d7e3fe7d6f2
Reviewed-on: https://gerrit.mot.com/2205094
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/2273817
Reviewed-by: gaoyx9 <gaoyx9@motorola.com>
Submit-Approved: gaoyx9 <gaoyx9@motorola.com>
Tested-by: gaoyx9 <gaoyx9@motorola.com>
---
 msm/dsi/dsi_defs.h    |  1 +
 msm/dsi/dsi_display.c | 12 +++++++-----
 msm/dsi/dsi_panel.c   |  3 +++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 630a6a2a43cd..8081cc5c9295 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -665,6 +665,7 @@ struct dsi_display_mode_priv_info {
 	struct msm_display_dsc_info dsc;
 	struct msm_display_vdc_info vdc;
 	bool dsc_enabled;
+	bool panel_dsc_update_pps_disable;
 	bool vdc_enabled;
 	struct msm_ratio pclk_scale;
 	struct msm_roi_caps roi_caps;
diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 4bbcf367ffe9..43c71a17c07c 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -9190,11 +9190,13 @@ int dsi_display_enable(struct dsi_display *display)
 	if ((mode->priv_info->dsc_enabled ||
 			mode->priv_info->vdc_enabled) &&
 		!(mode->dsi_mode_flags & DSI_MODE_FLAG_DMS_FPS)) {
-		rc = dsi_panel_update_pps(display->panel);
-		if (rc) {
-			DSI_ERR("[%s] panel pps cmd update failed, rc=%d\n",
-				display->name, rc);
-			goto error;
+		if(!mode->priv_info->panel_dsc_update_pps_disable){
+		  	rc = dsi_panel_update_pps(display->panel);
+		  	if (rc) {
+				DSI_ERR("[%s] panel pps cmd update failed, rc=%d\n",
+					display->name, rc);
+				goto error;
+			}
 		}
 	}
 
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index dcb08e054124..772f592191d2 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3277,6 +3277,7 @@ static int dsi_panel_parse_dsc_params(struct dsi_display_mode *mode,
 	priv_info = mode->priv_info;
 
 	priv_info->dsc_enabled = false;
+	priv_info->panel_dsc_update_pps_disable = false;
 	compression = utils->get_property(utils->data,
 			"qcom,compression-mode", NULL);
 	if (compression && !strcmp(compression, "dsc"))
@@ -3287,6 +3288,8 @@ static int dsi_panel_parse_dsc_params(struct dsi_display_mode *mode,
 		return 0;
 	}
 
+	priv_info->panel_dsc_update_pps_disable = utils->read_bool(utils->data,
+                                "qcom,mdss-dsc-update-pps-disable");
 	rc = utils->read_u32(utils->data, "qcom,mdss-dsc-version", &data);
 	if (rc) {
 		priv_info->dsc.config.dsc_version_major = 0x1;

From 426f309830a37a883fd874cb318e9d9df28ee67e Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@motorola.com>
Date: Fri, 20 May 2022 14:20:53 +0800
Subject: [PATCH 095/116] display: fix Local hbm restore '0' backlight level
 issue

sometimes,finger unlock, turn on FOD HBM first, and the
turn on the backlight, this caused the restore '0' brightness
that screen can not be turned on.

Change-Id: I450373a5b50d30e2147a0a6534bdec007a12b60f
Signed-off-by: tanhua1 <tanhua1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2274898
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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 772f592191d2..59dfb1190d6e 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -882,14 +882,14 @@ 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;
-
 	if(panel->lhbm_config.enable) {
 		panel->lhbm_config.dbv_level = bl_lvl;
 		DSI_INFO("backlight type:%d dbv lvl:%d\n", bl->type, 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);
 	switch (bl->type) {
 	case DSI_BACKLIGHT_WLED:

From 5b8a3db8a23543762d26a2b9caef650c92c2979f Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Tue, 17 May 2022 11:15:25 +0800
Subject: [PATCH 096/116] msm/drm: use drm ioctl to set panel feature

msm/drm:
Use drm ioctl to set panel feature, avoid panel features
are not set instantly.

Change-Id: I6779c3b665f4b887a00cf41bb818ae03917755ac
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2270744
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Submit-Approved: Jira Key
---
 include/uapi/display/drm/sde_drm.h | 21 ++++++++++++++++++
 msm/msm_drv.c                      | 34 ++++++++++++++++++++++++++++++
 msm/msm_kms.h                      |  3 +++
 msm/sde/sde_kms.c                  | 22 +++++++++++++++++++
 4 files changed, 80 insertions(+)

diff --git a/include/uapi/display/drm/sde_drm.h b/include/uapi/display/drm/sde_drm.h
index 67fc98b4152c..bd8e8c219a43 100644
--- a/include/uapi/display/drm/sde_drm.h
+++ b/include/uapi/display/drm/sde_drm.h
@@ -690,6 +690,27 @@ struct drm_msm_display_hint {
 #define DRM_IOCTL_MSM_DISPLAY_HINT DRM_IOW((DRM_COMMAND_BASE + \
 			DRM_MSM_DISPLAY_HINT), struct drm_msm_display_hint)
 
+/* panel feature */
+typedef enum {
+	PARAM_HBM = 0,
+	PARAM_CABC,
+	PARAM_ACL,
+	PARAM_DC,
+	POWER_MODE_MAX_NUM,
+	PARAM_COLOR = POWER_MODE_MAX_NUM,
+	PARAM_MAX_NUM
+} paramId_t;
+
+struct panel_param_info {
+	paramId_t param_idx;
+	__u32 value;
+};
+
+#define DRM_SET_PANEL_FEATURE	(DRM_COMMAND_END -1)
+#define DRM_IOCTL_SET_PANEL_FEATURE          DRM_IOWR(DRM_SET_PANEL_FEATURE, struct panel_param_info)
+#define DRM_GET_PANEL_FEATURE	(DRM_COMMAND_END-2)
+#define DRM_IOCTL_GET_PANEL_FEATURE          DRM_IOWR(DRM_GET_PANEL_FEATURE, struct panel_param_info)
+
 #if defined(__cplusplus)
 }
 #endif
diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index 2c3e81f7cabf..870a7e4cbdbc 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -1746,6 +1746,38 @@ int msm_ioctl_display_hint_ops(struct drm_device *dev, void *data,
 	return 0;
 }
 
+static int msm_ioctl_set_panel_feature(struct drm_device *dev, void *data,
+		struct drm_file *file_priv)
+{
+	struct msm_drm_private *priv;
+	struct msm_kms *kms;
+	struct panel_param_info *param_info = data;
+	int ret;
+
+	priv = dev->dev_private;
+	kms = priv->kms;
+
+	if (unlikely(!param_info)) {
+		DRM_ERROR("ioctl_set_panel_feature invalid data\n");
+		return -EINVAL;
+	}
+
+	DRM_INFO("ioctl_set_panel_feature idx=%d, value=%d\n",
+		param_info->param_idx, param_info->value);
+
+	if (kms && kms->funcs && kms->funcs->set_panel_feature) {
+		ret = kms->funcs->set_panel_feature(kms, *param_info);
+		if (ret) {
+			DRM_ERROR("kms set_panel_feature failed.\n");
+			goto fail;
+		}
+	}
+
+	return 0;
+fail:
+	return ret;
+}
+
 static const struct drm_ioctl_desc msm_ioctls[] = {
 	DRM_IOCTL_DEF_DRV(MSM_GEM_NEW,      msm_ioctl_gem_new,      DRM_AUTH|DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(MSM_GEM_CPU_PREP, msm_ioctl_gem_cpu_prep, DRM_AUTH|DRM_RENDER_ALLOW),
@@ -1761,6 +1793,8 @@ static const struct drm_ioctl_desc msm_ioctls[] = {
 			DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF_DRV(MSM_DISPLAY_HINT, msm_ioctl_display_hint_ops,
 			DRM_UNLOCKED),
+	DRM_IOCTL_DEF_DRV(SET_PANEL_FEATURE, msm_ioctl_set_panel_feature,
+			DRM_UNLOCKED),
 };
 
 static const struct vm_operations_struct vm_ops = {
diff --git a/msm/msm_kms.h b/msm/msm_kms.h
index 058f97cdf53a..c56c2f61f03d 100644
--- a/msm/msm_kms.h
+++ b/msm/msm_kms.h
@@ -133,6 +133,9 @@ struct msm_kms_funcs {
 	/* topology dsc information */
 	int (*get_dsc_count)(const struct msm_kms *kms,
 			u32 hdisplay, u32 *num_dsc);
+	/* set panel feature */
+	int (*set_panel_feature)(const struct msm_kms *kms,
+			struct panel_param_info param_info);
 };
 
 struct msm_kms {
diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c
index ededce65fb3e..e750b82cf7dc 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -3657,6 +3657,27 @@ static int sde_kms_get_dsc_count(const struct msm_kms *kms,
 	return 0;
 }
 
+static int sde_kms_set_panel_feature(const struct msm_kms *kms,
+		struct panel_param_info param_info)
+{
+	struct sde_kms *sde_kms;
+	struct dsi_display *display;
+	struct msm_param_info param_info_msm;
+
+	if (!kms) {
+		SDE_ERROR("invalid input args\n");
+		return -EINVAL;
+	}
+
+	sde_kms = to_sde_kms(kms);
+	param_info_msm.param_idx = (enum msm_param_id)param_info.param_idx;
+	param_info_msm.value = param_info.value;
+	display = (struct dsi_display *)sde_kms->dsi_displays[0];
+	dsi_display_set_param(display, &param_info_msm);
+
+	return 0;
+}
+
 static void _sde_kms_null_commit(struct drm_device *dev,
 		struct drm_encoder *enc)
 {
@@ -4085,6 +4106,7 @@ static const struct msm_kms_funcs kms_funcs = {
 	.check_for_splash = sde_kms_check_for_splash,
 	.get_mixer_count = sde_kms_get_mixer_count,
 	.get_dsc_count = sde_kms_get_dsc_count,
+	.set_panel_feature = sde_kms_set_panel_feature,
 };
 
 static int _sde_kms_mmu_destroy(struct sde_kms *sde_kms)

From 641084c3751a235fd3695c565131e05d150ab0d1 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Tue, 31 May 2022 17:41:33 +0800
Subject: [PATCH 097/116] drm/panel: check panel status before send custom
 commands

drm/panel:
Check whether panel is ready, before send custom command.
Otherwise, try to enable dsi,but actually fail.

Change-Id: Ia34efc2a6fe386e4d713303ce52248ebeb62c5a8
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2285035
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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 59dfb1190d6e..ba67f6a4fb2e 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1011,6 +1011,11 @@ static int dsi_panel_send_param_cmd(struct dsi_panel *panel,
 
 	mutex_lock(&panel->panel_lock);
 
+	if (!panel->panel_initialized) {
+		rc = -ENODEV;
+		goto end;
+	}
+
 	if (param_info->value >= panel_param->val_max)
 		param_info->value = panel_param->val_max - 1;
 

From 6d698433e1047f14ac31397abaf91290678653fc Mon Sep 17 00:00:00 2001
From: Xiaojun Lv <lvxj4@motorola.com>
Date: Tue, 14 Jun 2022 21:16:02 +0800
Subject: [PATCH 098/116] drm/msm:add delay between mipi0 to reset0 when power
 off

drm/msm:
add delay between mipi0 to reset0 when power off

Change-Id: I16e754492482abf64551471bbaac7574685267a8
Reviewed-on: https://gerrit.mot.com/2300466
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 15 +++++++++++++++
 msm/dsi/dsi_panel.h |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index ba67f6a4fb2e..68d4ab617340 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -533,6 +533,11 @@ static int dsi_panel_power_off(struct dsi_panel *panel)
 	if (gpio_is_valid(panel->reset_config.disp_en_gpio))
 		gpio_set_value(panel->reset_config.disp_en_gpio, 0);
 
+	if(panel->delayms_before_resetlow) {
+		DSI_DEBUG("[lcm] panel = %s delay %d ms before reset low\n", panel->name, panel->delayms_before_resetlow);
+		usleep_range( panel->delayms_before_resetlow * 1000, panel->delayms_before_resetlow * 1000);
+	}
+
 	if (gpio_is_valid(panel->reset_config.reset_gpio) &&
 					!panel->reset_gpio_always_on)
 		gpio_set_value(panel->reset_config.reset_gpio, 0);
@@ -2732,6 +2737,7 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 	struct dsi_parser_utils *utils = &panel->utils;
 	const char *string;
 	int i, rc = 0;
+	u32 val = 0;
 
 	panel->ulps_feature_enabled =
 		utils->read_bool(utils->data, "qcom,ulps-enabled");
@@ -2763,6 +2769,15 @@ static int dsi_panel_parse_misc_features(struct dsi_panel *panel)
 	panel->need_execute_shutdown = utils->read_bool(utils->data,
 			"qcom,platform-need-execute-shutdown");
 
+	rc = utils->read_u32(utils->data, "qcom,platform-delayms-before-resetlow", &val);
+	if (rc) {
+		DSI_DEBUG("[%s] qcom,platform-delayms-before-resetlow unspecified, defaulting to zero\n",
+			 panel->name);
+		panel->delayms_before_resetlow = 0;
+	} else {
+		panel->delayms_before_resetlow = val;
+	}
+
 	panel->spr_info.enable = false;
 	panel->spr_info.pack_type = MSM_DISPLAY_SPR_TYPE_MAX;
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 26066cd5ca80..b30913ae548b 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -347,6 +347,8 @@ struct dsi_panel {
 	bool need_execute_shutdown;
 	atomic_t esd_recovery_pending;
 
+	u32 delayms_before_resetlow;
+
 	bool is_twm_en;
 	bool skip_panel_off;
 	bool panel_initialized;

From 3ceb892a708a0cf04e2d272e57c31fd1ff07d5e0 Mon Sep 17 00:00:00 2001
From: Xiaojun Lv <lvxj4@motorola.com>
Date: Wed, 22 Jun 2022 15:46:28 +0800
Subject: [PATCH 099/116] msm/drm:compatible with different hbm table in panel

msm/drm:
according panel_ver compatible with different hbm table in panel

Change-Id: I9eb47dab28d7b38d5687be0b322493347478f22f
Reviewed-on: https://gerrit.mot.com/2309365
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: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 68d4ab617340..dfdda739db7c 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -4204,6 +4204,8 @@ static int dsi_panel_parse_local_hbm_config(struct dsi_panel *panel)
 {
 	int rc = 0;
 	u32 size;
+	struct device_node *np;
+	char hbm_table_name[64];
 	struct dsi_panel_lhbm_config *lhbm_config;
 	struct dsi_parser_utils *utils = &panel->utils;
 
@@ -4233,15 +4235,31 @@ static int dsi_panel_parse_local_hbm_config(struct dsi_panel *panel)
 			return rc;
 		}
 
+		np = of_find_node_by_path("/chosen");
+		of_property_read_u64(np, "mmi,panel_ver", &panel->panel_ver);
+		of_node_put(np);
+
+		snprintf(hbm_table_name, sizeof(hbm_table_name),
+			"qcom,mdss-dsi-panel-local-hbm-alpha-%0x-table", panel->panel_ver);
+
 		rc = utils->read_u32_array(utils->data,
+			hbm_table_name,
+			lhbm_config->alpha,
+			lhbm_config->alpha_size);
+		if (rc) {
+			rc = utils->read_u32_array(utils->data,
 				"qcom,mdss-dsi-panel-local-hbm-alpha-table",
 				lhbm_config->alpha,
 				lhbm_config->alpha_size);
-		if (rc) {
-			DSI_ERR("%s:%d, Unable to read local hbm alpha table,rc:%u\n",
-					__func__, __LINE__, rc);
-			lhbm_config->enable = false;
-			return rc;
+			if (rc) {
+				DSI_ERR("%s:%d, Unable to read local hbm alpha table,rc:%u\n",
+						__func__, __LINE__, rc);
+				lhbm_config->enable = false;
+				return rc;
+			}
+		} else {
+			DSI_INFO("%s:%d, use specified table:%s\n",
+					__func__, __LINE__, hbm_table_name);
 		}
 
 		rc = utils->read_u32(utils->data,

From 483fe19458ba41364785b725a6ce9488586f4409 Mon Sep 17 00:00:00 2001
From: wangyq13 <wangyq13@lenovo.com>
Date: Fri, 15 Jul 2022 15:14:08 +0800
Subject: [PATCH 100/116] drm/dsi_panel: resend hbm off commands

drm:
resend hbm off commands, sometimes lhbm is not closed successfully,
send again to reduce the possibility.

Change-Id: I23d2f23bc9920f1c824e2af50229d62d2d27c906
Signed-off-by: wangyq13 <wangyq13@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2334757
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Reviewed-by: <lvxj4@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 13 +++++++++++--
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index dfdda739db7c..0d7eb401c49c 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1186,9 +1186,15 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 		if (rc < 0) {
 			DSI_ERR("%s: failed to send param cmds. ret=%d\n", __func__, rc);
 		} else {
-			if(lhbm_config->enable)
+			if(lhbm_config->enable) {
 				bl_lvl = lhbm_config->dbv_level;
-			else
+				if (lhbm_config->resend_lbhm_off && param_info->value == HBM_OFF_STATE) {
+					usleep_range(5000, 5010);
+					rc = dsi_panel_send_param_cmd(panel, param_info);
+					if (rc < 0)
+						DSI_ERR("%s: failed to resend param cmds. ret=%d\n", __func__, rc);
+				}
+			} else
 				bl_lvl = HBM_BRIGHTNESS(param_info->value);
 			rc = dsi_panel_set_backlight(panel, bl_lvl);
 			if (rc)
@@ -4271,6 +4277,9 @@ static int dsi_panel_parse_local_hbm_config(struct dsi_panel *panel)
 			lhbm_config->enable = false;
 			return rc;
 		}
+
+		lhbm_config->resend_lbhm_off = utils->read_bool(utils->data,
+			"qcom,mdss-dsi-panel-resend-local-hbm-off");
 	} else {
 		DSI_INFO("%s:%d, no local hbm config\n",
 				__func__, __LINE__);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index b30913ae548b..784422840c6b 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -225,6 +225,7 @@ struct dsi_panel_spr_info {
 
 struct dsi_panel_lhbm_config {
 	bool enable;
+	bool resend_lbhm_off;
 	u32 dbv_level;
 	u32 alpha_reg;
 	u32 alpha_size;

From 0620256fb4386f0307a50583038fac66b319df37 Mon Sep 17 00:00:00 2001
From: zhanggb <zhanggb@motorola.com>
Date: Sat, 13 Aug 2022 10:26:23 +0800
Subject: [PATCH 101/116] drm_ioctl: add return value for set_param

DC mode will not be set properly if sde_kms_set_panel_feature does
not return error value when it fails.

Change-Id: I49d38a22f4c78406085888a07cf71dc056223651
Reviewed-on: https://gerrit.mot.com/2362283
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Guobin Zhang <zhanggb@motorola.com>
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Submit-Approved: Jira Key
---
 msm/sde/sde_kms.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c
index e750b82cf7dc..a3696f26820d 100644
--- a/msm/sde/sde_kms.c
+++ b/msm/sde/sde_kms.c
@@ -3663,6 +3663,7 @@ static int sde_kms_set_panel_feature(const struct msm_kms *kms,
 	struct sde_kms *sde_kms;
 	struct dsi_display *display;
 	struct msm_param_info param_info_msm;
+	int rc = 0;
 
 	if (!kms) {
 		SDE_ERROR("invalid input args\n");
@@ -3673,9 +3674,12 @@ static int sde_kms_set_panel_feature(const struct msm_kms *kms,
 	param_info_msm.param_idx = (enum msm_param_id)param_info.param_idx;
 	param_info_msm.value = param_info.value;
 	display = (struct dsi_display *)sde_kms->dsi_displays[0];
-	dsi_display_set_param(display, &param_info_msm);
+	rc = dsi_display_set_param(display, &param_info_msm);
+	if (rc)
+		SDE_ERROR("set param %d value %d failed\n",
+			param_info_msm.param_idx, param_info_msm.value);
 
-	return 0;
+	return rc;
 }
 
 static void _sde_kms_null_commit(struct drm_device *dev,

From 6416a48b6ba5d42335bdc0585f89e109630b201b Mon Sep 17 00:00:00 2001
From: hq_caoqunhui_tmp <caoqunhui@huaqin.com>
Date: Mon, 15 Aug 2022 16:51:17 +0800
Subject: [PATCH 102/116] display: The lcd backlight shift mode update

Modify:
    Update lcd backlight shift mode for the 2nd supply

Change-Id: If70bdbc3c1320a733cd32ede8e0cc64b0cc76cc3
Signed-off-by: hq_caoqunhui_tmp <caoqunhui@huaqin.com>
Reviewed-on: https://gerrit.mot.com/2362677
Reviewed-by: Hua Tan <tanhua1@motorola.com>
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 20 +++++++++++++++++++-
 msm/dsi/dsi_panel.h |  6 ++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 0d7eb401c49c..f16644c93c01 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -715,14 +715,22 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 		dsi->mode_flags |= MIPI_DSI_MODE_LPM;
 	}
 
+       if (panel->bl_config.bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0){
+                DSI_ERR("dsi_panel_update_backlight cqh bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0\n");
+                bl_lvl = ((((bl_lvl >> 3) & 0xff) << 8) | ((bl_lvl << 1) & 0x0e));
+       }
+
 	if (panel->bl_config.bl_inverted_dbv)
+	{
 		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
+	}
 
         if (bl->bl_2bytes_enable){
                 bl_lvl_2bytes =  ((bl_lvl & 0xff00) >> 8) | ((bl_lvl & 0xff) << 8);
                 rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl_2bytes);
-        }else
+        }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);
@@ -3178,6 +3186,16 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel)
 		panel->bl_config.brightness_default_level = val;
 	}
 
+	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;
+               DSI_ERR("dsi_panel_update_backlight cqh bl_level_align = %s \n",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 784422840c6b..03922d2bd0c4 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -92,6 +92,11 @@ enum bl_update_flag {
 	BL_UPDATE_NONE,
 };
 
+enum dsi_backlight_level_align_type {
+       DSI_BACKLIGHT_LEVEL_ALIGN_NORMAL = 0,
+       DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0 = 1,
+};
+
 enum {
 	MODE_GPIO_NOT_VALID = 0,
 	MODE_SEL_DUAL_PORT,
@@ -161,6 +166,7 @@ struct dsi_backlight_config {
 	u32 bl_level;
 	u32 bl_scale;
 	u32 bl_scale_sv;
+	u32 bl_level_align;
 	bool bl_inverted_dbv;
 	bool bl_demura_cmd;
 	u32 demura_type;

From 031a6e371fc9267706d955567b85ab4352982cbf Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Tue, 23 Aug 2022 14:08:46 +0800
Subject: [PATCH 103/116] display/dsi:add new lcd backlight align type for
 bit11_4

display/backlight:
add new lcd backlight align type for bit11_4

Change-Id: I4f17cd5bc0668d49c998d322abd44908c4be1dce
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2368834
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_panel.c | 12 ++++++++----
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index f16644c93c01..116073228b22 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -715,10 +715,14 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 		dsi->mode_flags |= MIPI_DSI_MODE_LPM;
 	}
 
-       if (panel->bl_config.bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0){
-                DSI_ERR("dsi_panel_update_backlight cqh bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0\n");
-                bl_lvl = ((((bl_lvl >> 3) & 0xff) << 8) | ((bl_lvl << 1) & 0x0e));
-       }
+	if (panel->bl_config.bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0){
+		DSI_ERR("dsi_panel_update_backlight cqh bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0\n");
+		bl_lvl = ((((bl_lvl >> 3) & 0xff) << 8) | ((bl_lvl << 1) & 0x0e));
+	}
+	else if (DSI_BACKLIGHT_LEVEL_ALIGN_BIT11_4_BYTE0 == panel->bl_config.bl_level_align) {
+		bl_lvl = (((bl_lvl & 0xff0) << 4) | (bl_lvl & 0x0f));
+		DSI_DEBUG("case BIT11_4, trans bl_lvl=0x%04x\n", bl_lvl);
+	}
 
 	if (panel->bl_config.bl_inverted_dbv)
 	{
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 03922d2bd0c4..92fdcd2f6351 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -95,6 +95,7 @@ enum bl_update_flag {
 enum dsi_backlight_level_align_type {
        DSI_BACKLIGHT_LEVEL_ALIGN_NORMAL = 0,
        DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0 = 1,
+       DSI_BACKLIGHT_LEVEL_ALIGN_BIT11_4_BYTE0 = 2,
 };
 
 enum {

From 34271928bb17be0772324d579241325c108d5f37 Mon Sep 17 00:00:00 2001
From: hujing3 <hujing3@lenovo.com>
Date: Thu, 1 Sep 2022 17:36:55 +0800
Subject: [PATCH 104/116] display/backlight: support hbm dcs only with 51 cmd

some product use 51 cmd to support HBM,
shouldn't reset brightness when hbm on

Change-Id: Ia2db13dfc3f131f9137bbb6f9ee6cd80406b7a8f
Signed-off-by: hujing3 <hujing3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2376249
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 9 ++++++++-
 msm/dsi/dsi_panel.h | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 116073228b22..a178451c4f19 100644
--- 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)) {
@@ -4398,6 +4401,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 92fdcd2f6351..7503cfd7f576 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -405,6 +405,7 @@ struct dsi_panel {
 	int panel_recovery_retry;
 	bool is_panel_dead;
 
+	bool is_hbm_using_51_cmd;
 	int hbm_en_gpio;
 };
 

From f05934875674d2c9ca731599d29e16d37c13f231 Mon Sep 17 00:00:00 2001
From: djw <longc143@motorola.com>
Date: Thu, 8 Sep 2022 17:54:41 +0800
Subject: [PATCH 105/116] kernel/panel:power on/off reset sequence

pnangn:fix power on/off reset sequence
add power off reset always on and power off pull down

Change-Id: I9eb112f99be8f0fe4eaecb295b8f7d8a5728fd72
Signed-off-by: djw <longc143@motorola.com>
Reviewed-on: https://gerrit.mot.com/2380613
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Jing Hu <hujing3@lenovo.com>
Reviewed-by: Dezhen Hou <houdz1@motorola.com>
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Hua Tan <tanhua1@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 13 +++++++++++++
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 14 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index a178451c4f19..46800b40d277 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -488,6 +488,16 @@ static int dsi_panel_power_on(struct dsi_panel *panel)
 		goto exit;
 	}
 
+	if (panel->reset_config.panel_on_rst_pull_down) {
+                /* need pull down lcd rst first */
+
+                if (gpio_is_valid(panel->reset_config.reset_gpio)) {
+                        DSI_INFO("dsp dbg: set lcd reset_gpio to 0\n");
+                        gpio_set_value(panel->reset_config.reset_gpio, 0);
+                        usleep_range(3000, 3000 + 100);
+                }
+	}
+
 	if (!panel->keep_regulators_on) {
 		rc = dsi_pwr_enable_regulator(&panel->power_info, true);
 		if (rc) {
@@ -2722,6 +2732,9 @@ static int dsi_panel_parse_reset_sequence(struct dsi_panel *panel)
 		goto error;
 	}
 
+	panel->reset_config.panel_on_rst_pull_down = utils->read_bool(utils->data,
+                                "qcom,mdss-panel-on-rst-pull-down");
+
 	rc = utils->read_u32_array(utils->data, "qcom,mdss-dsi-reset-sequence",
 					arr_32, length);
 	if (rc) {
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 7503cfd7f576..180867674ec0 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -200,6 +200,7 @@ struct dsi_panel_reset_config {
 	int disp_en_gpio;
 	int lcd_mode_sel_gpio;
 	u32 mode_sel_state;
+	bool panel_on_rst_pull_down;
 };
 
 enum esd_check_status_mode {

From 583452c1f3dccac0cb68349d7d7f1a42bc393169 Mon Sep 17 00:00:00 2001
From: longch98 <longch98@motorola.com>
Date: Thu, 17 Nov 2022 19:05:59 +0800
Subject: [PATCH 106/116] kernel:pnangn:update 2nd panel brightness settings to
 11bits

pnangn:update 2nd panel
 brightness settings to 11bits

Change-Id: I945dc7db9bf0eabfc30250e13f38f775a523c5ed
Signed-off-by: longch98 <longch98@motorola.com>
Reviewed-on: https://gerrit.mot.com/2432251
SLTApproved: Slta Waiver
Reviewed-by: Jing Hu <hujing3@lenovo.com>
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 | 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 46800b40d277..fa0390dae381 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -734,11 +734,15 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 		DSI_DEBUG("case BIT11_4, trans bl_lvl=0x%04x\n", bl_lvl);
 	}
 
+	if (panel->bl_config.bl_shift_left_1bit)
+	{
+		bl_lvl = (bl_lvl << 1);
+	}
+
 	if (panel->bl_config.bl_inverted_dbv)
 	{
 		bl_lvl = (((bl_lvl & 0xff) << 8) | (bl_lvl >> 8));
 	}
-
         if (bl->bl_2bytes_enable){
                 bl_lvl_2bytes =  ((bl_lvl & 0xff00) >> 8) | ((bl_lvl & 0xff) << 8);
                 rc = mipi_dsi_dcs_set_display_brightness(dsi, bl_lvl_2bytes);
@@ -3222,6 +3226,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_shift_left_1bit = utils->read_bool(utils->data,
+			"qcom,mdss-dsi-bl-level-shift-left-1bit");
+
+	DSI_INFO("[%s] bl_shift_left_1bit=%d\n", panel->name,
+			panel->bl_config.bl_shift_left_1bit);
+
 	panel->bl_config.bl_demura_cmd= utils->read_bool(utils->data,
 			"qcom,brightness-demura-command");
 
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 180867674ec0..ec7d27bff028 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -160,6 +160,7 @@ struct dsi_backlight_config {
 	enum bl_update_flag bl_update;
 
 	bool bl_2bytes_enable;
+	bool bl_shift_left_1bit;
 	u32 bl_min_level;
 	u32 bl_max_level;
 	u32 brightness_max_level;

From f5e340052d6cf8e073bf863f2470b0da5877cf48 Mon Sep 17 00:00:00 2001
From: hq_caoqunhui_tmp <caoqunhui@huaqin.com>
Date: Tue, 6 Dec 2022 16:40:10 +0800
Subject: [PATCH 107/116] optimze lcd log

Details:
optimze lcd log

Change-Id: I07e085b0df39fa07c00838fa3a7df58393b6fb54
Reviewed-on: https://gerrit.mot.com/2452094
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index fa0390dae381..8a8744cfd90b 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -726,7 +726,7 @@ static int dsi_panel_update_backlight(struct dsi_panel *panel,
 	}
 
 	if (panel->bl_config.bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0){
-		DSI_ERR("dsi_panel_update_backlight cqh bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0\n");
+		DSI_DEBUG("dsi_panel_update_backlight cqh bl_level_align == DSI_BACKLIGHT_LEVEL_ALIGN_BIT15_8_BIT3_0\n");
 		bl_lvl = ((((bl_lvl >> 3) & 0xff) << 8) | ((bl_lvl << 1) & 0x0e));
 	}
 	else if (DSI_BACKLIGHT_LEVEL_ALIGN_BIT11_4_BYTE0 == panel->bl_config.bl_level_align) {

From 1b287a4b619a78f4ad7e55d48cd3168be9af0f6c Mon Sep 17 00:00:00 2001
From: tinno64 <tinno64@motorola.com>
Date: Thu, 23 Mar 2023 19:50:26 +0800
Subject: [PATCH 108/116] display-drivers: local hbm: add suport for
 dc_hybird_threshold

For bangkok, there is a threshold that swith hybird mode to DC mode.
When backight is not large than this threshold, we must set the register(0x51)
to the threshold, let backlight enter DC mode.

Change-Id: I0aecbb42c9046a10bd1e907f9e6508d5687503dd
Signed-off-by: tinno64 <tinno64@motorola.com>
Reviewed-on: https://gerrit.mot.com/2550939
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 | 42 ++++++++++++++++++++++++++++--------------
 msm/dsi/dsi_panel.h |  1 +
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 8a8744cfd90b..d5ce8bd2c1cc 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1142,21 +1142,35 @@ static int dsi_panel_set_local_hbm_param(struct dsi_panel *panel,
 
 		for (i =0; i < count; i++) {
 			payload = (u8 *)cmds->msg.tx_buf;
-			if(param_info->value == HBM_FOD_ON_STATE &&
-				payload[0] == lhbm_config->alpha_reg) {
-				if(lhbm_config->dbv_level >lhbm_config->alpha_size) {
-					DSI_ERR("unsupport dbv level %d on local hbm\n", lhbm_config->dbv_level);
-					rc = -EINVAL;
-					goto end;
-				}
+			if(param_info->value == HBM_FOD_ON_STATE) {
+				if(payload[0] == lhbm_config->alpha_reg) {
+					if(lhbm_config->dbv_level >lhbm_config->alpha_size) {
+						DSI_ERR("unsupport dbv level %d on local hbm\n", lhbm_config->dbv_level);
+						rc = -EINVAL;
+						goto end;
+					}
 
-				alpha = lhbm_config->alpha[lhbm_config->dbv_level];
-				payload[1] = (alpha&0xff00)>>8;
-				payload[2] = alpha&0xff;
-				DSI_INFO("%s: alpha [%x]=%x%x\n",
-				        __func__, payload[0], payload[1], payload[2]);
-				rc =  0;
-				goto end;
+					alpha = lhbm_config->alpha[lhbm_config->dbv_level];
+					payload[1] = (alpha&0xff00)>>8;
+					payload[2] = alpha&0xff;
+					DSI_INFO("%s: alpha [%x]=%x%x\n",
+					        __func__, payload[0], payload[1], payload[2]);
+					rc =  0;
+					goto end;
+				} else if(payload[0] == 0X51 &&
+					lhbm_config->dc_hybird_threshold != 0) {
+					if(lhbm_config->dbv_level < lhbm_config->dc_hybird_threshold) {
+						payload[1] = (lhbm_config->dc_hybird_threshold & 0xff00) >> 8;
+						payload[2] = lhbm_config->dc_hybird_threshold & 0xff;
+
+					} else {
+						payload[1] = (lhbm_config->dbv_level & 0xff00) >> 8;
+						payload[2] = lhbm_config->dbv_level & 0xff;
+					}
+					DSI_INFO("%s: [%x]=%x%x\n",
+						__func__, payload[0], payload[1], payload[2]);
+					continue;
+				}
 			} else if(param_info->value == HBM_OFF_STATE &&
 				payload[0] == 0x51) {
 				payload[1] = (lhbm_config->dbv_level&0xff00)>>8;
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index ec7d27bff028..471f62e4345c 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -234,6 +234,7 @@ struct dsi_panel_spr_info {
 
 struct dsi_panel_lhbm_config {
 	bool enable;
+	u32 dc_hybird_threshold;
 	bool resend_lbhm_off;
 	u32 dbv_level;
 	u32 alpha_reg;

From c1d1d1151e57b12bd2a75dd08fb3fa8bf9680796 Mon Sep 17 00:00:00 2001
From: tinno64 <tinno64@motorola.com>
Date: Wed, 12 Apr 2023 16:03:53 +0800
Subject: [PATCH 109/116] dts/display: [bangkok] update the dsc configure for
 tianma panel

Support the dsc parameter from novateck

refer to https://gerrit.mot.com/#/c/2405493/

Change-Id: I1b7f95937ef6305ca37094d8896a46e4d70c633e
Signed-off-by: tinno64 <tinno64@motorola.com>
Reviewed-on: https://gerrit.mot.com/2573598
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  |  25 ++++--
 msm/msm_drv.h        |   1 +
 msm/sde_dsc_helper.c | 207 +++++++++++++++++++++++++++++++++++++++++++
 msm/sde_dsc_helper.h |   2 +
 4 files changed, 229 insertions(+), 6 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index d5ce8bd2c1cc..19f92855ac7d 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -3511,12 +3511,25 @@ static int dsi_panel_parse_dsc_params(struct dsi_display_mode *mode,
 	priv_info->dsc.config.slice_count = DIV_ROUND_UP(intf_width,
 		priv_info->dsc.config.slice_width);
 
-	rc = sde_dsc_populate_dsc_config(&priv_info->dsc.config,
-			priv_info->dsc.scr_rev);
-	if (rc) {
-		DSI_DEBUG("failed populating dsc params\n");
-		rc = -EINVAL;
-		goto error;
+	priv_info->dsc.dsc_novatek_ic = utils->read_bool(utils->data,
+		"qcom,mdss-dsc-novateck-ic");
+	if (priv_info->dsc.dsc_novatek_ic) {
+		rc = sde_dsc_populate_dsc_config_nt(&priv_info->dsc.config,
+				priv_info->dsc.scr_rev);
+		if (rc) {
+			DSI_DEBUG("failed populating dsc params(nt)\n");
+			rc = -EINVAL;
+			goto error;
+		}
+
+	} else {
+		rc = sde_dsc_populate_dsc_config(&priv_info->dsc.config,
+				priv_info->dsc.scr_rev);
+		if (rc) {
+			DSI_DEBUG("failed populating dsc params\n");
+			rc = -EINVAL;
+			goto error;
+		}
 	}
 
 	rc = sde_dsc_populate_dsc_private_params(&priv_info->dsc, intf_width);
diff --git a/msm/msm_drv.h b/msm/msm_drv.h
index 5288daada136..80a898eec7fc 100644
--- a/msm/msm_drv.h
+++ b/msm/msm_drv.h
@@ -426,6 +426,7 @@ struct msm_display_dsc_info {
 	u32 dsc_4hsmerge_alignment;
 	bool half_panel_pu;
 	int datatype;
+	bool dsc_novatek_ic;
 };
 
 
diff --git a/msm/sde_dsc_helper.c b/msm/sde_dsc_helper.c
index a56202a16f20..7d3c212d1062 100644
--- a/msm/sde_dsc_helper.c
+++ b/msm/sde_dsc_helper.c
@@ -103,6 +103,71 @@ static char sde_dsc_rc_range_bpg[DSC_RATIO_TYPE_MAX][DSC_NUM_BUF_RANGES] = {
 	{10, 8, 6, 4, 2, 0, -2, -4, -6, -8, -10, -10, -12, -12, -12},
 };
 
+static char sde_dsc_rc_range_min_qp_nt[DSC_RATIO_TYPE_MAX][DSC_NUM_BUF_RANGES] = {
+	/* DSC v1.1 */
+	{0, 0, 1, 1, 3, 3, 3, 3, 3, 3, 5, 5, 5, 7, 13},
+	{0, 4, 5, 5, 7, 7, 7, 7, 7, 8, 9, 9, 9, 12, 16},
+	{0, 4, 5, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 11, 15},
+	/* DSC v1.1 SCR and DSC v1.2 RGB 444 */
+	{0, 0, 1, 1, 3, 3, 3, 3, 3, 3, 5, 5, 5, 9, 12},
+	{0, 4, 5, 5, 7, 7, 7, 7, 7, 7, 9, 9, 9, 13, 16},
+	{0, 4, 5, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 11, 15},
+	/* DSC v1.2 YUV422 */
+	{0, 0, 1, 1, 3, 3, 3, 3, 3, 3, 5, 5, 5, 7, 10},
+	{0, 4, 5, 5, 7, 7, 7, 7, 7, 7, 9, 9, 9, 13, 16},
+	{0, 4, 9, 9, 11, 11, 11, 11, 11, 11, 13, 13, 13, 17, 20},
+	{0, 2, 3, 4, 5, 5, 5, 6, 6, 7, 8, 8, 9, 11, 12},
+	/* DSC v1.2 YUV420 */
+	{0, 0, 1, 1, 3, 3, 3, 3, 3, 3, 5, 5, 5, 7, 10},
+	{0, 2, 3, 4, 6, 7, 7, 7, 7, 7, 9, 9, 9, 11, 14},
+	{0, 2, 3, 4, 5, 5, 5, 6, 6, 7, 8, 8, 9, 11, 12},
+};
+
+/*
+ * Rate control - Max QP values for each ratio type in sde_dsc_ratio_type
+ */
+static char sde_dsc_rc_range_max_qp_nt[DSC_RATIO_TYPE_MAX][DSC_NUM_BUF_RANGES] = {
+	/* DSC v1.1 */
+	{4, 4, 5, 6, 7, 7, 7, 8, 9, 10, 11, 12, 13, 13, 15},
+	{8, 8, 9, 10, 11, 11, 11, 12, 13, 14, 14, 15, 15, 16, 17},
+	{7, 8, 9, 10, 11, 11, 11, 12, 13, 13, 14, 14, 15, 15, 16},
+	/* DSC v1.1 SCR and DSC v1.2 RGB 444 */
+	{4, 4, 5, 6, 7, 7, 7, 8, 9, 10, 10, 11, 11, 12, 13},
+	{8, 8, 9, 10, 11, 11, 11, 12, 13, 14, 14, 15, 15, 16, 17},
+	{7, 8, 9, 10, 11, 11, 11, 12, 13, 13, 14, 14, 15, 15, 16},
+	/* DSC v1.2 YUV422 */
+	{3, 4, 5, 6, 7, 7, 7, 8, 9, 9, 10, 10, 11, 11, 12},
+	{2, 4, 5, 6, 7, 7, 7, 8, 8, 9, 9, 9, 9, 10, 11},
+	{7, 8, 9, 10, 11, 11, 11, 12, 13, 13, 14, 14, 15, 15, 16},
+	{2, 5, 5, 6, 6, 7, 7, 8, 9, 9, 10, 11, 11, 12, 13},
+	/* DSC v1.2 YUV420 */
+	{2, 4, 5, 6, 7, 7, 7, 8, 8, 9, 9, 9, 9, 10, 12},
+	{2, 5, 7, 8, 9, 10, 11, 12, 12, 13, 13, 13, 13, 14, 15},
+	{2, 5, 5, 6, 6, 7, 7, 8, 9, 9, 10, 11, 11, 12, 13},
+	};
+/*
+ * Rate control - bpg offset values for each ratio type in sde_dsc_ratio_type
+ */
+static char sde_dsc_rc_range_bpg_nt[DSC_RATIO_TYPE_MAX][DSC_NUM_BUF_RANGES] = {
+	/* DSC v1.1 */
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -12, -12, -12, -12},
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -10, -12, -12, -12},
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -10, -12, -12, -12},
+	/* DSC v1.1 SCR and DSC V1.2 RGB 444 */
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -12, -12, -12, -12},
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -12, -12, -12, -12},
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -10, -12, -12, -12},
+	/* DSC v1.2 YUV422 */
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -10, -12, -12, -12},
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -12, -12, -12, -12},
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -10, -12, -12, -12},
+	{10, 8, 6, 4, 2, 0, -2, -4, -6, -8, -10, -10, -12, -12, -12},
+	/* DSC v1.2 YUV420 */
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -12, -12, -12, -12},
+	{2, 0, 0, -2, -4, -6, -8, -8, -8, -10, -10, -12, -12, -12, -12},
+	{10, 8, 6, 4, 2, 0, -2, -4, -6, -8, -10, -10, -12, -12, -12},
+};
+
 /**
  * Maps to lookup the sde_dsc_ratio_type index used in rate control tables
  */
@@ -352,6 +417,148 @@ int sde_dsc_populate_dsc_config(struct drm_dsc_config *dsc, int scr_ver) {
 	return 0;
 }
 
+int sde_dsc_populate_dsc_config_nt(struct drm_dsc_config *dsc, int scr_ver) {
+	int bpp, bpc;
+	int groups_per_line, groups_total;
+	int min_rate_buffer_size;
+	int hrd_delay;
+	int pre_num_extra_mux_bits, num_extra_mux_bits;
+	int slice_bits;
+	int data;
+	int final_value, final_scale;
+	int i, ratio_idx;
+
+	dsc->rc_model_size = 8192;
+
+	if ((dsc->dsc_version_major == 0x1) &&
+			(dsc->dsc_version_minor == 0x1)) {
+		if (scr_ver == 0x1)
+			dsc->first_line_bpg_offset = 15;
+		else
+			dsc->first_line_bpg_offset = 13;
+	} else if (dsc->dsc_version_minor == 0x2) {
+		dsc->first_line_bpg_offset = _get_dsc_v1_2_bpg_offset(dsc);
+	}
+
+	dsc->rc_edge_factor = 6;
+	dsc->rc_tgt_offset_high = 3;
+	dsc->rc_tgt_offset_low = 3;
+	dsc->simple_422 = 0;
+	dsc->convert_rgb = 1;
+	dsc->vbr_enable = 0;
+
+	bpp = DSC_BPP(*dsc);
+	bpc = dsc->bits_per_component;
+
+	ratio_idx = _get_rc_table_index(dsc, scr_ver);
+	if (ratio_idx == -EINVAL)
+		return ratio_idx;
+
+	for (i = 0; i < DSC_NUM_BUF_RANGES - 1; i++)
+		dsc->rc_buf_thresh[i] = sde_dsc_rc_buf_thresh[i];
+
+	for (i = 0; i < DSC_NUM_BUF_RANGES; i++) {
+		dsc->rc_range_params[i].range_min_qp =
+			sde_dsc_rc_range_min_qp_nt[ratio_idx][i];
+		dsc->rc_range_params[i].range_max_qp =
+			sde_dsc_rc_range_max_qp_nt[ratio_idx][i];
+		dsc->rc_range_params[i].range_bpg_offset =
+			sde_dsc_rc_range_bpg_nt[ratio_idx][i];
+	}
+
+	if (bpp == 8) {
+		dsc->initial_offset = 6144;
+		dsc->initial_xmit_delay = 512;
+	} else if (bpp == 10) {
+		dsc->initial_offset = 5632;
+		dsc->initial_xmit_delay = 410;
+	} else {
+		dsc->initial_offset = 2048;
+		dsc->initial_xmit_delay = 341;
+	}
+
+	dsc->line_buf_depth = bpc + 1;
+
+	if (bpc == 8) {
+		dsc->flatness_min_qp = 3;
+		dsc->flatness_max_qp = 12;
+		dsc->rc_quant_incr_limit0 = 11;
+		dsc->rc_quant_incr_limit1 = 11;
+		dsc->mux_word_size = DSC_MUX_WORD_SIZE_8_10_BPC;
+	} else if (bpc == 10) { /* 10bpc */
+		dsc->flatness_min_qp = 7;
+		dsc->flatness_max_qp = 16;
+		dsc->rc_quant_incr_limit0 = 15;
+		dsc->rc_quant_incr_limit1 = 15;
+		dsc->mux_word_size = DSC_MUX_WORD_SIZE_8_10_BPC;
+	} else { /* 12 bpc */
+		dsc->flatness_min_qp = 11;
+		dsc->flatness_max_qp = 20;
+		dsc->rc_quant_incr_limit0 = 19;
+		dsc->rc_quant_incr_limit1 = 19;
+		dsc->mux_word_size = DSC_MUX_WORD_SIZE_12_BPC;
+	}
+	if ((dsc->dsc_version_minor == 0x2) && (dsc->native_420)) {
+		dsc->second_line_bpg_offset = 12;
+		dsc->second_line_offset_adj = 512;
+		dsc->nsl_bpg_offset = 2048 *
+			(DIV_ROUND_UP(dsc->second_line_bpg_offset,
+				(dsc->slice_height - 1)));
+	}
+
+	groups_per_line = DIV_ROUND_UP(dsc->slice_width, 3);
+
+	dsc->slice_chunk_size = dsc->slice_width * bpp / 8;
+	if ((dsc->slice_width * bpp) % 8)
+		dsc->slice_chunk_size++;
+
+	/* rbs-min */
+	min_rate_buffer_size =  dsc->rc_model_size - dsc->initial_offset +
+			dsc->initial_xmit_delay * bpp +
+			groups_per_line * dsc->first_line_bpg_offset;
+
+	hrd_delay = DIV_ROUND_UP(min_rate_buffer_size, bpp);
+
+	dsc->initial_dec_delay = hrd_delay - dsc->initial_xmit_delay;
+
+	dsc->initial_scale_value = 8 * dsc->rc_model_size /
+			(dsc->rc_model_size - dsc->initial_offset);
+
+	slice_bits = 8 * dsc->slice_chunk_size * dsc->slice_height;
+
+	groups_total = groups_per_line * dsc->slice_height;
+
+	data = dsc->first_line_bpg_offset * 2048;
+
+	dsc->nfl_bpg_offset = DIV_ROUND_UP(data, (dsc->slice_height - 1));
+
+	pre_num_extra_mux_bits = 3 * (dsc->mux_word_size + (4 * bpc + 4) - 2);
+
+	num_extra_mux_bits = pre_num_extra_mux_bits - (dsc->mux_word_size -
+		((slice_bits - pre_num_extra_mux_bits) % dsc->mux_word_size));
+
+	data = 2048 * (dsc->rc_model_size - dsc->initial_offset
+		+ num_extra_mux_bits);
+	dsc->slice_bpg_offset = DIV_ROUND_UP(data, groups_total);
+
+	data = dsc->initial_xmit_delay * bpp;
+	final_value =  dsc->rc_model_size - data + num_extra_mux_bits;
+
+	final_scale = 8 * dsc->rc_model_size /
+		(dsc->rc_model_size - final_value);
+
+	dsc->final_offset = final_value;
+
+	data = (final_scale - 9) * (dsc->nfl_bpg_offset +
+		dsc->slice_bpg_offset);
+	dsc->scale_increment_interval = (2048 * dsc->final_offset) / data;
+
+	dsc->scale_decrement_interval = groups_per_line /
+		(dsc->initial_scale_value - 8);
+
+	return 0;
+}
+
 int sde_dsc_populate_dsc_private_params(struct msm_display_dsc_info *dsc_info,
 		int intf_width)
 {
diff --git a/msm/sde_dsc_helper.h b/msm/sde_dsc_helper.h
index b630421064e8..4f836711ad6a 100644
--- a/msm/sde_dsc_helper.h
+++ b/msm/sde_dsc_helper.h
@@ -18,5 +18,7 @@ int sde_dsc_populate_dsc_private_params(struct msm_display_dsc_info *dsc_info,
 int sde_dsc_create_pps_buf_cmd(struct msm_display_dsc_info *dsc_info,
 		char *buf, int pps_id, u32 len);
 
+int sde_dsc_populate_dsc_config_nt(struct drm_dsc_config *dsc, int scr_ver);
+
 #endif /* __SDE_DSC_HELPER_H__ */
 

From d314cb28a3660b41518139872f9858e4779f5aec Mon Sep 17 00:00:00 2001
From: tinno64 <tinno64@motorola.com>
Date: Thu, 11 May 2023 14:51:41 +0800
Subject: [PATCH 110/116] Support 120Hz command sending

    Some panels need send command to DDIC.
    That TP can get the current refresh rate.
    Or Switch GAMMA for OLED.

refer to https://gerrit.mot.com/#/c/2340396/

Change-Id: Ie2d35432173a5c28608364ef1523f228bd9546f5
Signed-off-by: tinno64 <tinno64@motorola.com>
Reviewed-on: https://gerrit.mot.com/2603583
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_defs.h  | 2 ++
 msm/dsi/dsi_panel.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/msm/dsi/dsi_defs.h b/msm/dsi/dsi_defs.h
index 8081cc5c9295..2221465ab5c1 100644
--- a/msm/dsi/dsi_defs.h
+++ b/msm/dsi/dsi_defs.h
@@ -271,6 +271,7 @@ 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_DFPS_CMD_120:              DFPS switch to 120
  * @DSI_CMD_SET_DFPS_CMD_90:               DFPS switch to 90
  * @DSI_CMD_SET_DFPS_CMD_60:               DFPS switch to 60
  * @DSI_CMD_SET_DC_ON:                    DC mode on
@@ -317,6 +318,7 @@ enum dsi_cmd_set_type {
 	DSI_CMD_SET_CABC_UI,
 	DSI_CMD_SET_CABC_MV,
 	DSI_CMD_SET_CABC_DIS,
+	DSI_CMD_SET_DFPS_CMD_120,
 	DSI_CMD_SET_DFPS_CMD_90,
 	DSI_CMD_SET_DFPS_CMD_60,
 	DSI_CMD_SET_DC_ON,
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 19f92855ac7d..a532f490a2ca 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2452,6 +2452,7 @@ 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-dfps-120-command",
 	"qcom,mdss-dsi-dfps-90-command",
 	"qcom,mdss-dsi-dfps-60-command",
 	"qcom,mdss-dsi-dc-on-command",
@@ -2498,6 +2499,7 @@ 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-dfps-120-command-state",
 	"qcom,mdss-dsi-dfps-90-command-state",
 	"qcom,mdss-dsi-dfps-60-command-state",
 	"qcom,mdss-dsi-dc-on-command-state",

From 146c63d8249302a37762392b229e72067200d511 Mon Sep 17 00:00:00 2001
From: tinno64 <tinno64@motorola.com>
Date: Thu, 11 May 2023 17:31:20 +0800
Subject: [PATCH 111/116] dsi/dfps: set the right fps when panel resume

When panel resume ,HWC will set the fps from the last suspend to panel.
If the panel is not the fps from init code.
We will set the right fps with dsi_panel_dfps_send_cmd().

refer to https://gerrit.mot.com/#/c/2386399/
         https://gerrit.mot.com/#/c/2419816/

Change-Id: I5a5b7d07daa1806852be69923e6f0993f07e2640
Signed-off-by: tinno64 <tinno64@motorola.com>
Reviewed-on: https://gerrit.mot.com/2603896
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 | 9 +++++++++
 msm/dsi/dsi_panel.c   | 4 ++++
 msm/dsi/dsi_panel.h   | 2 ++
 3 files changed, 15 insertions(+)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 43c71a17c07c..718b04ac9264 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -9183,6 +9183,15 @@ int dsi_display_enable(struct dsi_display *display)
 			goto error;
 		}
 		dsi_panel_reset_param(display->panel);
+
+		if (display->panel->dfps_caps.dfps_send_cmd_support) {
+			display->panel->dfps_caps.current_fps = display->panel->dfps_caps.panel_on_fps;
+			if (mode->timing.refresh_rate != display->panel->dfps_caps.panel_on_fps) {
+				DSI_INFO("[%s] dst_refresh_rate %d panel_on_fps %d\n", __func__, mode->timing.refresh_rate, display->panel->dfps_caps.panel_on_fps);
+				dsi_panel_dfps_send_cmd(display->panel);
+			}
+		}
+
 		dsi_display_enable_status(display, true);
 	}
 	dsi_display_panel_id_notification(display);
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index a532f490a2ca..b51c1bb65a50 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2169,6 +2169,10 @@ static int dsi_panel_parse_dfps_caps(struct dsi_panel *panel)
 
 	dfps_caps->dfps_send_cmd_support = utils->read_bool(utils->data,
 			"qcom,mdss-dsi-pan-dpfs-send-command");
+	if(dfps_caps->dfps_send_cmd_support) {
+		dfps_caps->panel_on_fps = dfps_caps->dfps_list[0];
+		dfps_caps->current_fps = dfps_caps->panel_on_fps;
+	}
 
 error:
 	return rc;
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 471f62e4345c..554400fe67c8 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -125,6 +125,8 @@ struct dsi_dfps_capabilities {
 	u32 dfps_list_len;
 	bool dfps_support;
 	bool dfps_send_cmd_support;
+	u32 panel_on_fps;
+	u32 current_fps;
 };
 
 struct dsi_qsync_capabilities {

From c7427915c73aac6665b38cae062e0cf0178db709 Mon Sep 17 00:00:00 2001
From: tinno64 <tinno64@motorola.com>
Date: Thu, 11 May 2023 16:02:04 +0800
Subject: [PATCH 112/116] dsi/dfps: update the dfps code to support "OLED+vid
 mode"

1.send cmd with async mode to switch fps
2.start to update timing when get TE signal

refer to https://gerrit.mot.com/#/c/2405274/

Change-Id: I027ac0c07fc6eb8a49a4072ad65aeac5f6de4289
Signed-off-by: tinno64 <tinno64@motorola.com>
Reviewed-on: https://gerrit.mot.com/2603801
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 |  5 ++++
 msm/dsi/dsi_panel.c   | 69 +++++++++++++++++++++++++++++++++++++++++--
 msm/dsi/dsi_panel.h   |  1 +
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c
index 718b04ac9264..0c6b2c40b866 100644
--- a/msm/dsi/dsi_display.c
+++ b/msm/dsi/dsi_display.c
@@ -5705,6 +5705,11 @@ static int dsi_display_set_mode_sub(struct dsi_display *display,
 						true);
 			}
 		}
+
+		if (display->panel->dfps_caps.dfps_send_cmd_with_te_async) {
+			if ((display->panel->dfps_caps.current_fps != 60)&&(display->panel->dfps_caps.current_fps != 90))
+				dsi_display_status_check_te(display,1);
+		}
 		rc = dsi_display_dfps_update(display, mode);
 		if (rc) {
 			DSI_ERR("[%s]DSI dfps update failed, rc=%d\n",
diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index b51c1bb65a50..64a0da09f7ab 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -630,6 +630,58 @@ error:
 	return rc;
 }
 
+static int dsi_panel_dfps_tx_cmd_set(struct dsi_panel *panel,
+				enum dsi_cmd_set_type type, bool async)
+{
+	int rc = 0, i = 0;
+	ssize_t len;
+	struct dsi_cmd_desc *cmds;
+	u32 count;
+	enum dsi_cmd_set_state state;
+	struct dsi_display_mode *mode;
+	const struct mipi_dsi_host_ops *ops = panel->host->ops;
+
+	if (!panel || !panel->cur_mode)
+		return -EINVAL;
+
+	mode = panel->cur_mode;
+
+	cmds = mode->priv_info->cmd_sets[type].cmds;
+	count = mode->priv_info->cmd_sets[type].count;
+	state = mode->priv_info->cmd_sets[type].state;
+	SDE_EVT32(type, state, count);
+
+	if (count == 0) {
+		DSI_DEBUG("[%s] No commands to be sent for state(%d)\n",
+			 panel->name, type);
+		goto error;
+	}
+
+	for (i = 0; i < count; i++) {
+		if (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;
+
+		if (async) cmds->msg.flags |= MIPI_DSI_MSG_ASYNC_OVERRIDE;
+		else cmds->msg.flags &= ~MIPI_DSI_MSG_ASYNC_OVERRIDE;
+
+		len = ops->transfer(panel->host, &cmds->msg);
+		if (len < 0) {
+			rc = len;
+			DSI_ERR("failed to set cmds(%d), rc=%d\n", type, rc);
+			goto error;
+		}
+		if (cmds->post_wait_ms)
+			usleep_range(cmds->post_wait_ms*1000,
+					((cmds->post_wait_ms*1000)+10));
+		cmds++;
+	}
+error:
+	return rc;
+}
+
 static int dsi_panel_pinctrl_deinit(struct dsi_panel *panel)
 {
 	int rc = 0;
@@ -2167,6 +2219,9 @@ static int dsi_panel_parse_dfps_caps(struct dsi_panel *panel)
 			dfps_caps->max_refresh_rate = dfps_caps->dfps_list[i];
 	}
 
+	dfps_caps->dfps_send_cmd_with_te_async = utils->read_bool(utils->data,
+			"qcom,mdss-dsi-pan-dfps-send-command-with-te-async");
+
 	dfps_caps->dfps_send_cmd_support = utils->read_bool(utils->data,
 			"qcom,mdss-dsi-pan-dpfs-send-command");
 	if(dfps_caps->dfps_send_cmd_support) {
@@ -6212,6 +6267,7 @@ int dsi_panel_dfps_send_cmd(struct dsi_panel *panel)
 	enum dsi_cmd_set_type type = DSI_CMD_SET_DFPS_CMD_60;
 	char cmd_set_prop[64];
 	int rc = 0;
+	bool async = false;
 
 	if (!panel || !panel->cur_mode)
 		return -EINVAL;
@@ -6229,13 +6285,22 @@ int dsi_panel_dfps_send_cmd(struct dsi_panel *panel)
 		}
 	}
 
-	DSI_INFO("prop %s refresh_rate %d type %d\n", cmd_set_prop, refresh_rate, type);
+	//DSI_INFO("prop %s refresh_rate %d type %d\n", cmd_set_prop, refresh_rate, type);
+	if (panel->dfps_caps.dfps_send_cmd_with_te_async) {
+		if ((panel->dfps_caps.current_fps == 60)||(panel->dfps_caps.current_fps == 90)) async = false;
+		else async = true;
+	}
 
-	rc = dsi_panel_tx_cmd_set(panel, type);
+	DSI_INFO("fps switch %d to %d , async %d\n",panel->dfps_caps.current_fps, refresh_rate, async);
+
+	rc = dsi_panel_dfps_tx_cmd_set(panel, type, async);
 	if (rc) {
 		DSI_ERR("[%s] failed to send %s cmds, rc=%d\n",
 		       panel->name, cmd_set_prop_map[type], rc);
+	} else {
+		panel->dfps_caps.current_fps= refresh_rate;
 	}
+
 	mutex_unlock(&panel->panel_lock);
 
 	return rc;
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index 554400fe67c8..cea0cc403c7c 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -125,6 +125,7 @@ struct dsi_dfps_capabilities {
 	u32 dfps_list_len;
 	bool dfps_support;
 	bool dfps_send_cmd_support;
+	bool dfps_send_cmd_with_te_async;
 	u32 panel_on_fps;
 	u32 current_fps;
 };

From 2b9042f881f980f535afef65c899db956de158da Mon Sep 17 00:00:00 2001
From: tinno64 <tinno64@motorola.com>
Date: Fri, 19 May 2023 16:26:26 +0800
Subject: [PATCH 113/116] msm/display-drivers: release lhbm resource

Malloc the memory when panel init.
So must free the memory when panel put.

refer to https://gerrit.mot.com/#/c/2377115/

Change-Id: I4a2fde8ca012ad17cc0572bb739c31941d4a4f47
Signed-off-by: tinno64 <tinno64@motorola.com>
Reviewed-on: https://gerrit.mot.com/2615038
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 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index 64a0da09f7ab..c4cc9a4f50f3 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -2223,7 +2223,7 @@ static int dsi_panel_parse_dfps_caps(struct dsi_panel *panel)
 			"qcom,mdss-dsi-pan-dfps-send-command-with-te-async");
 
 	dfps_caps->dfps_send_cmd_support = utils->read_bool(utils->data,
-			"qcom,mdss-dsi-pan-dpfs-send-command");
+			"qcom,mdss-dsi-pan-dfps-send-command");
 	if(dfps_caps->dfps_send_cmd_support) {
 		dfps_caps->panel_on_fps = dfps_caps->dfps_list[0];
 		dfps_caps->current_fps = dfps_caps->panel_on_fps;
@@ -4423,6 +4423,12 @@ static int dsi_panel_parse_local_hbm_config(struct dsi_panel *panel)
 	return 0;
 }
 
+static void dsi_panel_lhbm_config_deinit(struct dsi_panel_lhbm_config *lhbm_config)
+{
+	if (lhbm_config->alpha)
+		kfree(lhbm_config->alpha);
+}
+
 static void dsi_panel_update_util(struct dsi_panel *panel,
 				  struct device_node *parser_node)
 {
@@ -4825,6 +4831,8 @@ void dsi_panel_put(struct dsi_panel *panel)
 	/* free resources allocated for ESD check */
 	dsi_panel_esd_config_deinit(&panel->esd_config);
 
+	dsi_panel_lhbm_config_deinit(&panel->lhbm_config);
+
 	kfree(panel);
 }
 

From d67e46e138eb9e61359cd90b92786417152d8dea Mon Sep 17 00:00:00 2001
From: tinno64 <tinno64@motorola.com>
Date: Mon, 22 May 2023 17:01:04 +0800
Subject: [PATCH 114/116] gpu/msm: check fps value before enable lhbm

Don't allow lhbm enable under specific fps, such 48hz.
If enable lhbm when fps is 48hz, screen will flicker due to
hardware limitation.
So check fps value before enable lhbm.
refer to https://gerrit.mot.com/#/c/2383010/

Change-Id: I0c9b6bc3a42c7eb83c0df73c9453892098e9c0cf
Signed-off-by: tinno64 <tinno64@motorola.com>
Reviewed-on: https://gerrit.mot.com/2616578
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 | 75 +++++++++++++++++++++++++++++++++++++++++++++
 msm/dsi/dsi_panel.h |  5 +++
 2 files changed, 80 insertions(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index c4cc9a4f50f3..cb547af2b512 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1241,6 +1241,48 @@ end:
 	return rc;
 };
 
+static bool dsi_panel_lhbm_not_allowed_list(struct dsi_panel *panel)
+{
+	int i;
+
+	for (i = 0; i < panel->lhbm_config.lhbm_not_allowed_fps_list_len; i++) {
+		if (panel->lhbm_config.lhbm_not_allowed_fps_list[i] ==
+			panel->cur_mode->timing.refresh_rate)
+			return true;
+	}
+
+	return false;
+}
+
+static int dsi_panel_lhbm_waitfor_fps_valid(struct dsi_panel *panel)
+{
+	u32 count = 30;
+	u32 poll_interval = 1;
+
+	count = panel->lhbm_config.lhbm_wait_for_fps_count;
+	if (count == 0)
+		return 0;
+
+	if (panel->lhbm_config.lhbm_wait_for_fps_interval)
+		poll_interval = panel->lhbm_config.lhbm_wait_for_fps_interval;
+
+	pr_info("%s count %d, interval %d\n", __func__, count, poll_interval);
+	while(dsi_panel_lhbm_not_allowed_list(panel)) {
+		if (!count) {
+			pr_warn("%s: it is timeout, and current_fps = %d\n", __func__,
+				panel->cur_mode->timing.refresh_rate);
+			break;
+		} else if (count > poll_interval) {
+			usleep_range(poll_interval * 1000, poll_interval *1000);
+			count -= poll_interval;
+		} else {
+			usleep_range(count * 1000, count *1000);
+			count = 0;
+		}
+	}
+	return 0;
+}
+
 static int dsi_panel_set_hbm(struct dsi_panel *panel,
                         struct msm_param_info *param_info)
 {
@@ -1277,6 +1319,9 @@ static int dsi_panel_set_hbm(struct dsi_panel *panel,
 			dsi_panel_set_local_hbm_param(panel, param_info, lhbm_config);
 		}
 
+	if (panel->lhbm_config.lhbm_wait_for_fps_valid && param_info->value == HBM_FOD_ON_STATE)
+		dsi_panel_lhbm_waitfor_fps_valid(panel);
+
 		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);
@@ -4416,6 +4461,36 @@ static int dsi_panel_parse_local_hbm_config(struct dsi_panel *panel)
 
 		lhbm_config->resend_lbhm_off = utils->read_bool(utils->data,
 			"qcom,mdss-dsi-panel-resend-local-hbm-off");
+
+		lhbm_config->lhbm_wait_for_fps_valid = utils->read_bool(utils->data,
+			"qcom,mdss-dsi-panel-lhbm-wait-fps-valid");
+
+		utils->read_u32(utils->data,
+				"qcom,mdss-dsi-panel-local-hbm-wait-fps-count",
+				&(lhbm_config->lhbm_wait_for_fps_count));
+
+		utils->read_u32(utils->data,
+				"qcom,mdss-dsi-panel-local-hbm-wait-fps-interval",
+				&(lhbm_config->lhbm_wait_for_fps_interval));
+
+		lhbm_config->lhbm_not_allowed_fps_list_len = utils->count_u32_elems(utils->data,
+					  "qcom,mdss-dsi-panel-lhbm-not-allowed-fps-list");
+		if (lhbm_config->lhbm_not_allowed_fps_list_len >= 1) {
+			lhbm_config->lhbm_not_allowed_fps_list = kcalloc(lhbm_config->lhbm_not_allowed_fps_list_len,
+					sizeof(u32), GFP_KERNEL);
+			if (!lhbm_config->lhbm_not_allowed_fps_list )
+				return -ENOMEM;
+
+			rc = utils->read_u32_array(utils->data,
+					"qcom,mdss-dsi-panel-lhbm-not-allowed-fps-list",
+					lhbm_config->lhbm_not_allowed_fps_list,
+					lhbm_config->lhbm_not_allowed_fps_list_len);
+			if (rc) {
+				DSI_ERR("[%s] lhbm not allowed fps list parse failed\n", panel->name);
+				return -EINVAL;
+			}
+		}
+
 	} else {
 		DSI_INFO("%s:%d, no local hbm config\n",
 				__func__, __LINE__);
diff --git a/msm/dsi/dsi_panel.h b/msm/dsi/dsi_panel.h
index cea0cc403c7c..802cf867df4c 100644
--- a/msm/dsi/dsi_panel.h
+++ b/msm/dsi/dsi_panel.h
@@ -243,6 +243,11 @@ struct dsi_panel_lhbm_config {
 	u32 alpha_reg;
 	u32 alpha_size;
 	u32 *alpha;
+	bool lhbm_wait_for_fps_valid;
+	u32 lhbm_wait_for_fps_count;
+	u32 lhbm_wait_for_fps_interval;
+	u32 *lhbm_not_allowed_fps_list;
+	u32 lhbm_not_allowed_fps_list_len;
 };
 
 enum panel_idx {

From a3c1fb46de93287ea500cca8ecd427423d4a714a Mon Sep 17 00:00:00 2001
From: tinno64 <tinno64@motorola.com>
Date: Wed, 7 Jun 2023 14:11:42 +0800
Subject: [PATCH 115/116] dsi_panel: fix the bug of local HBM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dynamically modify some commands, t
hen parse the next commands(cmds++)

refer to：https://gerrit.mot.com/#/c/2360381/
https://gerrit.mot.com/#/c/2361625/

Change-Id: I15ced51a990faf1c05565e49f96e1d55f3c3e3a9
Signed-off-by: tinno64 <tinno64@motorola.com>
Reviewed-on: https://gerrit.mot.com/2636365
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Zonghua Liu <a17671@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
---
 msm/dsi/dsi_panel.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index cb547af2b512..f316e02836c0 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1192,7 +1192,7 @@ static int dsi_panel_set_local_hbm_param(struct dsi_panel *panel,
 		cmds = param_map_state->cmds->cmds;
 		count = param_map_state->cmds->count;
 
-		for (i =0; i < count; i++) {
+		for (i =0; i < count; i++, cmds++) {
 			payload = (u8 *)cmds->msg.tx_buf;
 			if(param_info->value == HBM_FOD_ON_STATE) {
 				if(payload[0] == lhbm_config->alpha_reg) {
@@ -1208,7 +1208,7 @@ static int dsi_panel_set_local_hbm_param(struct dsi_panel *panel,
 					DSI_INFO("%s: alpha [%x]=%x%x\n",
 					        __func__, payload[0], payload[1], payload[2]);
 					rc =  0;
-					goto end;
+					continue;
 				} else if(payload[0] == 0X51 &&
 					lhbm_config->dc_hybird_threshold != 0) {
 					if(lhbm_config->dbv_level < lhbm_config->dc_hybird_threshold) {
@@ -1232,7 +1232,6 @@ static int dsi_panel_set_local_hbm_param(struct dsi_panel *panel,
 				rc =  0;
 				goto end;
 			}
-			cmds++;
 		}
 	}
 
@@ -4459,6 +4458,14 @@ static int dsi_panel_parse_local_hbm_config(struct dsi_panel *panel)
 			return rc;
 		}
 
+		rc = utils->read_u32(utils->data,
+			"qcom,mdss-dsi-panel-local-hbm-DC-HYBIRD-THRESHOLD-BL",
+			&(lhbm_config->dc_hybird_threshold));
+		if (rc) {
+			DSI_ERR("%s:qcom,mdss-dsi-panel-local-hbm-DC-HYBIRD-THRESHOLD-BL is not defined, set it to 0\n", __func__);
+			lhbm_config->dc_hybird_threshold = 0;
+		}
+
 		lhbm_config->resend_lbhm_off = utils->read_bool(utils->data,
 			"qcom,mdss-dsi-panel-resend-local-hbm-off");
 

From 04ec07f62b3c77ae7ac5acf55f27a8c4f692fd4d Mon Sep 17 00:00:00 2001
From: tanhua1 <tanhua1@motorola.com>
Date: Thu, 8 Jun 2023 15:50:52 +0800
Subject: [PATCH 116/116] dsi_panel: panel_feature: corret the code mistake

Without "break", After Setting ACL, then also set dc.
It is mistake.

Change-Id: I84d589b0545f87ee94a8dc9ec700bb6ff859b024
Signed-off-by: tanhua1 <tanhua1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2637985
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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/msm/dsi/dsi_panel.c b/msm/dsi/dsi_panel.c
index f316e02836c0..6efa552cfdd6 100644
--- a/msm/dsi/dsi_panel.c
+++ b/msm/dsi/dsi_panel.c
@@ -1404,6 +1404,7 @@ int dsi_panel_set_param(struct dsi_panel *panel,
 			break;
 		case PARAM_ACL_ID :
 			dsi_panel_set_acl(panel, param_info);
+			break;
 		case PARAM_DC_ID :
 			dsi_panel_set_dc(panel, param_info);
 			break;