Merge branch 'QK-eleven' into upstreamed-common

Official-Ayrton990 · Jul 24, 2021 · 02ea851 · 02ea851
2 parents 44abe50 + 7528e9a
commit 02ea851
Show file tree

Hide file tree

Showing 20 changed files with 148 additions and 155 deletions.
diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-g7a-36-02-0c-dsc-video.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-g7a-36-02-0c-dsc-video.dtsi
@@ -43,8 +43,8 @@
 		qcom,mdss-dsi-dma-trigger = "trigger_sw";
 		qcom,mdss-dsi-mdp-trigger = "none";
 		qcom,mdss-dsi-reset-sequence = <1 5>, <0 1>, <1 10>;
-		qcom,mdss-pan-physical-width-dimension = <695>;
-		qcom,mdss-pan-physical-height-dimension = <1544>;
+		qcom,mdss-pan-physical-width-dimension = <71>;
+		qcom,mdss-pan-physical-height-dimension = <158>;
 		qcom,mdss-dsi-tx-eot-append;
 		qcom,bl-update-flag = "delay_until_first_frame";
 		qcom,disp-panel-offon-mode-enabled;

diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-g7a-37-02-0a-dsc-video.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-g7a-37-02-0a-dsc-video.dtsi
@@ -43,8 +43,8 @@
 		qcom,mdss-dsi-dma-trigger = "trigger_sw";
 		qcom,mdss-dsi-mdp-trigger = "none";
 		qcom,mdss-dsi-reset-sequence = <1 5>, <0 1>, <1 10>;
-		qcom,mdss-pan-physical-width-dimension = <695>;
-		qcom,mdss-pan-physical-height-dimension = <1544>;
+		qcom,mdss-pan-physical-width-dimension = <71>;
+		qcom,mdss-pan-physical-height-dimension = <158>;
 		qcom,mdss-dsi-tx-eot-append;
 		qcom,bl-update-flag = "delay_until_first_frame";
 		qcom,disp-panel-offon-mode-enabled;

diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-g7a-37-02-0b-dsc-video.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-g7a-37-02-0b-dsc-video.dtsi
@@ -43,8 +43,8 @@
 		qcom,mdss-dsi-dma-trigger = "trigger_sw";
 		qcom,mdss-dsi-mdp-trigger = "none";
 		qcom,mdss-dsi-reset-sequence = <1 5>, <0 1>, <1 10>;
-		qcom,mdss-pan-physical-width-dimension = <695>;
-		qcom,mdss-pan-physical-height-dimension = <1544>;
+		qcom,mdss-pan-physical-width-dimension = <71>;
+		qcom,mdss-pan-physical-height-dimension = <158>;
 		qcom,mdss-dsi-tx-eot-append;
 		qcom,bl-update-flag = "delay_until_first_frame";
 		qcom,disp-panel-offon-mode-enabled;

diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j11-38-08-0a-fhd-cmd.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j11-38-08-0a-fhd-cmd.dtsi
@@ -23,8 +23,8 @@
 		qcom,mdss-dsi-dma-trigger = "trigger_sw";
 		qcom,mdss-dsi-mdp-trigger = "none";
 		qcom,mdss-dsi-reset-sequence = <0 1>, <1 10>;
-		qcom,mdss-pan-physical-width-dimension = <695>;
-		qcom,mdss-pan-physical-height-dimension = <1545>;
+		qcom,mdss-pan-physical-width-dimension = <71>;
+		qcom,mdss-pan-physical-height-dimension = <158>;
 
 		qcom,mdss-dsi-te-pin-select = <1>;
 		qcom,mdss-dsi-wr-mem-start = <0x2c>;
@@ -126,7 +126,6 @@
 	mi,mdss-dsi-panel-dc-threshold = <470>;
 	mi,mdss-dsi-panel-dc-type = <2>; /* differ to cmi */
 
-	mi,mdss-dsi-panel-fod-dimlayer-enabled;
 	mi,mdss-panel-fod-hbm-on-need-prepare;
 	mi,mdss-panel-delay-before-fod-hbm-on;
 	mi,mdss-panel-delay-before-fod-hbm-off;
@@ -189,7 +188,7 @@
 			mi,mdss-dsi-doze-hbm-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-doze-lbm-command-state = "dsi_lp_mode";
 
-			mi,mdss-dsi-hbm-fod-on-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 				39 00 00 00 00 00 03 F0 5A 5A
 				/* elvss dimming off */
 				39 00 00 00 00 00 02 B0 07
@@ -199,8 +198,8 @@
 				39 01 00 00 01 00 02 53 E0
 				/* HBM ON 800nit */
 				39 01 00 00 01 00 03 51 03 FF];
-			mi,mdss-dsi-hbm-fod-on-command-state = "dsi_hs_mode";
-			mi,mdss-dsi-hbm-fod-off-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_hs_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 				15 01 00 00 00 00 02 53 20
 				/* parameter will be updated base on last brightness */
 				39 01 00 00 00 00 03 51 03 FF
@@ -209,7 +208,7 @@
 				39 00 00 00 00 00 02 B0 07
 				39 00 00 00 00 00 02 B7 D1
 				39 01 00 00 00 00 03 F0 A5 A5];
-			mi,mdss-dsi-hbm-fod-off-command-state = "dsi_hs_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_hs_mode";
 
 			mi,mdss-dsi-hbm-off-command = [
 				15 01 00 00 00 00 02 53 28

diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j1s-42-02-0a-dsc-cmd.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j1s-42-02-0a-dsc-cmd.dtsi
@@ -23,8 +23,8 @@
 		qcom,mdss-dsi-dma-trigger = "trigger_sw";
 		qcom,mdss-dsi-mdp-trigger = "none";
 		qcom,mdss-dsi-reset-sequence = <1 1>, <0 1>, <1 10>;
-		qcom,mdss-pan-physical-width-dimension = <710>;
-		qcom,mdss-pan-physical-height-dimension = <1537>;
+		qcom,mdss-pan-physical-width-dimension = <68>;
+		qcom,mdss-pan-physical-height-dimension = <147>;
 		qcom,mdss-dsi-te-pin-select = <1>;
 		qcom,mdss-dsi-wr-mem-start = <0x2c>;
 		qcom,mdss-dsi-wr-mem-continue = <0x3c>;
@@ -362,7 +362,6 @@
 
 	mi,mdss-panel-on-dimming-delay = <120>;
 
-	mi,mdss-dsi-panel-fod-dimlayer-enabled;
 	mi,mdss-panel-delay-after-fod-hbm-off;
 	mi,mdss-panel-delay-after-fod-hbm-on;
 
@@ -442,7 +441,7 @@
 			mi,mdss-dsi-hbm-off-command-state = "dsi_lp_mode";
 
 			/* aod mode -> hbm on for fingerprint unlock */
-			mi,mdss-dsi-hbm-fod-on-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 				/* VI Setting voltage -3.5V */
 				39 01 00 00 00 00 06 F0 55 AA 52 08 01 /* Set page 1 */
 				39 00 00 00 00 00 09 B9 1F 1F 1F 1F 1F 1F 1F 1F
@@ -458,14 +457,14 @@
 				15 00 00 00 00 00 02 65 00
 				05 00 00 00 00 00 02 38 00
 				05 01 00 00 00 00 02 2C 00];
-			mi,mdss-dsi-hbm-fod-off-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 				/* Dimming Off */
 				15 01 00 00 00 00 02 53 20
 				/* Normal Mode */
 				/* parameter will be updated base on last brightness */
 				39 01 00 00 00 00 05 51 07 FF 00 00];
-			mi,mdss-dsi-hbm-fod-on-command-state = "dsi_lp_mode";
-			mi,mdss-dsi-hbm-fod-off-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-normal-fod-on-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-aod-fod-to-normal-command-state = "dsi_lp_mode";
 
@@ -631,7 +630,7 @@
 			mi,mdss-dsi-hbm-off-command-state = "dsi_lp_mode";
 
 			/* aod mode -> hbm on for fingerprint unlock */
-			mi,mdss-dsi-hbm-fod-on-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 				/* VI Setting voltage -3.5V */
 				39 01 00 00 00 00 06 F0 55 AA 52 08 01 /* Set page 1 */
 				39 00 00 00 00 00 09 B9 1F 1F 1F 1F 1F 1F 1F 1F
@@ -654,14 +653,14 @@
 				39 00 00 00 00 00 08 BB 11 00 0E 5A 00 10 4F
 				15 00 00 00 00 00 02 2F 04
 				15 01 00 00 00 00 02 26 02];
-			mi,mdss-dsi-hbm-fod-off-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 				/* Dimming Off */
 				15 01 00 00 00 00 02 53 20
 				/* Normal Mode */
 				/* parameter will be updated base on last brightness */
 				39 01 00 00 00 00 05 51 07 FF 00 00];
-			mi,mdss-dsi-hbm-fod-on-command-state = "dsi_lp_mode";
-			mi,mdss-dsi-hbm-fod-off-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-normal-fod-on-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-aod-fod-to-normal-command-state = "dsi_lp_mode";
 

diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j1s-42-02-0a-mp-dsc-cmd.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j1s-42-02-0a-mp-dsc-cmd.dtsi
@@ -23,8 +23,8 @@
 		qcom,mdss-dsi-dma-trigger = "trigger_sw";
 		qcom,mdss-dsi-mdp-trigger = "none";
 		qcom,mdss-dsi-reset-sequence = <1 1>, <0 1>, <1 10>;
-		qcom,mdss-pan-physical-width-dimension = <710>;
-		qcom,mdss-pan-physical-height-dimension = <1537>;
+		qcom,mdss-pan-physical-width-dimension = <68>;
+		qcom,mdss-pan-physical-height-dimension = <147>;
 		qcom,mdss-dsi-te-pin-select = <1>;
 		qcom,mdss-dsi-wr-mem-start = <0x2c>;
 		qcom,mdss-dsi-wr-mem-continue = <0x3c>;
@@ -355,7 +355,6 @@
 
 	mi,mdss-panel-on-dimming-delay = <120>;
 
-	mi,mdss-dsi-panel-fod-dimlayer-enabled;
 	mi,mdss-panel-delay-after-fod-hbm-off;
 	mi,mdss-panel-delay-after-fod-hbm-on;
 
@@ -428,7 +427,7 @@
 			mi,mdss-dsi-hbm-off-command-state = "dsi_lp_mode";
 
 			/* aod mode -> hbm on for fingerprint unlock */
-			mi,mdss-dsi-hbm-fod-on-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 				/* VI Setting voltage -3.5V */
 				39 01 00 00 00 00 06 F0 55 AA 52 08 01 /* Set page 1 */
 				39 00 00 00 00 00 05 B9 1F 1F 1F 1F
@@ -444,14 +443,14 @@
 				15 00 00 00 00 00 02 65 00
 				05 00 00 00 00 00 02 38 00
 				05 01 00 00 00 00 02 2C 00];
-			mi,mdss-dsi-hbm-fod-off-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 				/* Dimming Off */
 				15 01 00 00 00 00 02 53 20
 				/* Normal Mode */
 				/* parameter will be updated base on last brightness */
 				39 01 00 00 00 00 05 51 07 FF 00 00];
-			mi,mdss-dsi-hbm-fod-on-command-state = "dsi_lp_mode";
-			mi,mdss-dsi-hbm-fod-off-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-normal-fod-on-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-aod-fod-to-normal-command-state = "dsi_lp_mode";
 
@@ -590,7 +589,7 @@
 			mi,mdss-dsi-hbm-off-command-state = "dsi_lp_mode";
 
 			/* aod mode -> hbm on for fingerprint unlock */
-			mi,mdss-dsi-hbm-fod-on-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 				/* VI Setting voltage -3.5V */
 				39 01 00 00 00 00 06 F0 55 AA 52 08 01 /* Set page 1 */
 				39 00 00 00 00 00 05 B9 1F 1F 1F 1F
@@ -612,14 +611,14 @@
 				39 00 00 00 00 00 03 C1 00 4B
 				15 00 00 00 00 00 02 2F 04
 				15 01 00 00 00 00 02 26 02];
-			mi,mdss-dsi-hbm-fod-off-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 				/* Dimming Off */
 				15 01 00 00 00 00 02 53 20
 				/* Normal Mode */
 				/* parameter will be updated base on last brightness */
 				39 01 00 00 00 00 05 51 07 FF 00 00];
-			mi,mdss-dsi-hbm-fod-on-command-state = "dsi_lp_mode";
-			mi,mdss-dsi-hbm-fod-off-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-normal-fod-on-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-aod-fod-to-normal-command-state = "dsi_lp_mode";
 

diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j1s-42-02-0a-p1-1-dsc-cmd.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j1s-42-02-0a-p1-1-dsc-cmd.dtsi
@@ -23,8 +23,8 @@
 		qcom,mdss-dsi-dma-trigger = "trigger_sw";
 		qcom,mdss-dsi-mdp-trigger = "none";
 		qcom,mdss-dsi-reset-sequence = <1 1>, <0 1>, <1 10>;
-		qcom,mdss-pan-physical-width-dimension = <710>;
-		qcom,mdss-pan-physical-height-dimension = <1537>;
+		qcom,mdss-pan-physical-width-dimension = <68>;
+		qcom,mdss-pan-physical-height-dimension = <147>;
 		qcom,mdss-dsi-te-pin-select = <1>;
 		qcom,mdss-dsi-wr-mem-start = <0x2c>;
 		qcom,mdss-dsi-wr-mem-continue = <0x3c>;
@@ -361,7 +361,6 @@
 
 	mi,mdss-panel-on-dimming-delay = <120>;
 
-	mi,mdss-dsi-panel-fod-dimlayer-enabled;
 	mi,mdss-panel-delay-after-fod-hbm-off;
 	mi,mdss-panel-delay-after-fod-hbm-on;
 
@@ -434,7 +433,7 @@
 			mi,mdss-dsi-hbm-off-command-state = "dsi_lp_mode";
 
 			/* aod mode -> hbm on for fingerprint unlock */
-			mi,mdss-dsi-hbm-fod-on-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 				/* VI Setting voltage -3.5V */
 				39 01 00 00 00 00 06 F0 55 AA 52 08 01 /* Set page 1 */
 				39 00 00 00 00 00 05 B9 1F 1F 1F 1F
@@ -450,14 +449,14 @@
 				15 00 00 00 00 00 02 65 00
 				05 00 00 00 00 00 02 38 00
 				05 01 00 00 00 00 02 2C 00];
-			mi,mdss-dsi-hbm-fod-off-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 				/* Dimming Off */
 				15 01 00 00 00 00 02 53 20
 				/* Normal Mode */
 				/* parameter will be updated base on last brightness */
 				39 01 00 00 00 00 05 51 07 FF 00 00];
-			mi,mdss-dsi-hbm-fod-on-command-state = "dsi_lp_mode";
-			mi,mdss-dsi-hbm-fod-off-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-normal-fod-on-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-aod-fod-to-normal-command-state = "dsi_lp_mode";
 
@@ -596,7 +595,7 @@
 			mi,mdss-dsi-hbm-off-command-state = "dsi_lp_mode";
 
 			/* aod mode -> hbm on for fingerprint unlock */
-			mi,mdss-dsi-hbm-fod-on-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 				/* VI Setting voltage -3.5V */
 				39 01 00 00 00 00 06 F0 55 AA 52 08 01 /* Set page 1 */
 				39 00 00 00 00 00 05 B9 1F 1F 1F 1F
@@ -618,14 +617,14 @@
 				39 00 00 00 00 00 03 C1 00 4B
 				15 00 00 00 00 00 02 2F 04
 				15 01 00 00 00 00 02 26 02];
-			mi,mdss-dsi-hbm-fod-off-command = [
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 				/* Dimming Off */
 				15 01 00 00 00 00 02 53 20
 				/* Normal Mode */
 				/* parameter will be updated base on last brightness */
 				39 01 00 00 00 00 05 51 07 FF 00 00];
-			mi,mdss-dsi-hbm-fod-on-command-state = "dsi_lp_mode";
-			mi,mdss-dsi-hbm-fod-off-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_lp_mode";
+			qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-normal-fod-on-command-state = "dsi_lp_mode";
 			mi,mdss-dsi-aod-fod-to-normal-command-state = "dsi_lp_mode";
 

diff --git a/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j1t-38-0c-0a-dsc-cmd.dtsi b/arch/arm64/boot/dts/vendor/qcom/dsi-panel-j1t-38-0c-0a-dsc-cmd.dtsi
@@ -443,24 +443,24 @@
 	    mi,mdss-dsi-hbm-on-command-state = "dsi_hs_mode";
 	    mi,mdss-dsi-hbm-off-command-state = "dsi_hs_mode";
 
-	    mi,mdss-dsi-hbm-fod-on-command = [
+	    qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 		/* ELVSS DIM Off */
 		39 00 00 00 00 00 03 F0 5A 5A
 		39 00 00 00 00 00 02 B0 02
 		39 00 00 00 00 00 02 B5 93
 		39 00 00 00 00 00 03 F0 A5 A5
 		/* HBM Mode On transition(60Hz) */
 		39 01 00 00 00 00 02 53 E0];
-	    mi,mdss-dsi-hbm-fod-off-command = [
+	    qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 		/* DLY On */
 		39 00 00 00 00 00 03 F0 5A 5A
 		39 00 00 00 00 00 02 B0 02
 		39 00 00 00 00 00 02 B5 13
 		39 00 00 00 00 00 03 F0 A5 A5
 		/* HBM Mode Off Normal transition(60Hz) */
 		39 01 00 00 00 00 02 53 20];
-	    mi,mdss-dsi-hbm-fod-on-command-state = "dsi_hs_mode";
-	    mi,mdss-dsi-hbm-fod-off-command-state = "dsi_hs_mode";
+	    qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_hs_mode";
+	    qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_hs_mode";
 
 	    mi,mdss-dsi-flat-on-command = [
 		39 00 00 00 00 00 03 F0 5A 5A
@@ -578,24 +578,24 @@
 	    mi,mdss-dsi-hbm-on-command-state = "dsi_hs_mode";
 	    mi,mdss-dsi-hbm-off-command-state = "dsi_hs_mode";
 
-	    mi,mdss-dsi-hbm-fod-on-command = [
+	    qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
 		/* ELVSS DIM Off */
 		39 00 00 00 00 00 03 F0 5A 5A
 		39 00 00 00 00 00 02 B0 02
 		39 00 00 00 00 00 02 B5 93
 		39 00 00 00 00 00 03 F0 A5 A5
 		/* HBM Mode On transition(90Hz) */
 		39 01 00 00 00 00 02 53 F0];
-	    mi,mdss-dsi-hbm-fod-off-command = [
+	    qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
 		/* DLY On */
 		39 00 00 00 00 00 03 F0 5A 5A
 		39 00 00 00 00 00 02 B0 02
 		39 00 00 00 00 00 02 B5 13
 		39 00 00 00 00 00 03 F0 A5 A5
 		/* HBM Mode Off Normal transition(90Hz) */
 		39 01 00 00 00 00 02 53 30];
-	    mi,mdss-dsi-hbm-fod-on-command-state = "dsi_hs_mode";
-	    mi,mdss-dsi-hbm-fod-off-command-state = "dsi_hs_mode";
+	    qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_hs_mode";
+	    qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_hs_mode";
 
 	    mi,mdss-dsi-flat-on-command = [
 		39 00 00 00 00 00 03 F0 5A 5A