Merge tag 'LA.UM.9.6.2.r1-04700-89xx.0' (A11)

"LA.UM.9.6.2.r1-04700-89xx.0"
TheSanty · Jul 7, 2021 · 690ce07 · 690ce07
2 parents 5578142 + b909054
commit 690ce07
Show file tree

Hide file tree

Showing 12 changed files with 382 additions and 63 deletions.
diff --git a/arch/arm64/boot/dts/qcom/sdm450.dtsi b/arch/arm64/boot/dts/qcom/sdm450.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, 2021 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
@@ -146,3 +146,8 @@
 	/delete-node/ case-therm-adc;
 	/delete-node/ case-therm-step;
 };
+&soc {
+	qcom,vidc@1d00000 {
+		qcom,max-hw-load = <734400>; /* 1080p@60 dec + 1080p@30 enc */
+	};
+};