Merge branch 'QK-eleven' into upstreamed-common

Official-Ayrton990 · Jun 3, 2022 · 5896268 · 5896268
2 parents 8c9ad1f + 06f5580
commit 5896268
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
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
@@ -262,18 +262,21 @@
 			mi,mdss-dsi-doze-lbm-command-state = "dsi_lp_mode";
 
 			qcom,mdss-dsi-dispparam-hbm-fod-on-command = [
-				39 00 00 00 10 00 03 F0 5A 5A
-				39 00 00 00 10 00 02 B0 07
-				39 00 00 00 10 00 02 B7 51
-				39 00 00 00 10 00 03 F0 A5 A5
-				39 01 00 00 10 00 02 53 E0];
+				39 00 00 00 00 00 03 F0 5A 5A
+				/* elvss dimming off */
+				39 00 00 00 00 00 02 B0 07
+				39 00 00 00 00 00 02 B7 51
+				39 01 00 00 00 00 03 F0 A5 A5
+				/* HBM on */
+				39 01 00 00 05 00 02 53 E0];
 			qcom,mdss-dsi-dispparam-hbm-fod-on-command-state = "dsi_hs_mode";
 			qcom,mdss-dsi-dispparam-hbm-fod-off-command = [
-				39 00 00 00 10 00 03 F0 5A 5A
-				39 00 00 00 10 00 02 B0 07
-				39 00 00 00 10 00 02 B7 51
-				39 00 00 00 10 00 03 F0 A5 A5
-				39 01 00 00 10 00 02 53 20];
+				15 01 00 00 00 00 02 53 20
+				39 00 00 00 00 00 03 F0 5A 5A
+				/* elvss dimming on */
+				39 00 00 00 00 00 02 B0 07
+				39 00 00 00 00 00 02 B7 D1
+				39 01 00 00 05 00 03 F0 A5 A5];
 			qcom,mdss-dsi-dispparam-hbm-fod-off-command-state = "dsi_hs_mode";
 
 			mi,mdss-dsi-hbm-off-command = [

diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h
@@ -48,10 +48,10 @@
 #define ARM64_HAS_CACHE_IDC			27
 #define ARM64_HAS_CACHE_DIC			28
 #define ARM64_HW_DBM				29
-#define ARM64_SSBD				30
-#define ARM64_MISMATCHED_CACHE_TYPE		31
-#define ARM64_HAS_STAGE2_FWB			32
-#define ARM64_HAS_CRC32			33
+#define ARM64_HAS_CRC32				30
+#define ARM64_SSBD				31
+#define ARM64_MISMATCHED_CACHE_TYPE		32
+#define ARM64_HAS_STAGE2_FWB			33
 #define ARM64_WORKAROUND_1463225		34
 #define ARM64_SSBS				35
 #define ARM64_WORKAROUND_1188873		36