Merge "ARM: dts: msm: Update GPU bus IB votes for SDM660"

1 files changed, 43 insertions, 37 deletions

diff --git a/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi b/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi
index d347f033b12d..1e62a2423e38 100644
--- a/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi
@@ -32,21 +32,26 @@
 		 * subsystem is inactive
 		 */
 		qcom,active-only;
+		/*
+		 * IB votes in MBPS, derived using below formula
+		 * IB = (DDR frequency * DDR bus width in Bytes * Dual rate)
+		 * Note: IB vote is per DDR channel vote
+		 */
 		qcom,bw-tbl =
 			<     0 /*  off     */ >,
-			<   762 /*  100 MHz */ >,
-			<  1144 /*  150 MHz */ >,
-			<  1525 /*  200 MHz */ >,
-			<  2288 /*  300 MHz */ >,
-			<  3143 /*  412 MHz */ >,
-			<  4173 /*  547 MHz */ >,
-			<  5195 /*  681 MHz */ >,
-			<  5859 /*  768 MHz */ >,
-			<  7759 /*  1017 MHz */ >,
-			<  9887 /*  1296 MHz */ >,
-			<  10327 /*  1353 MHz */ >,
-			<  11863 /*  1555 MHz */ >,
-			<  13763 /*  1804 MHz */ >;
+			<   381 /*  100 MHz */ >,
+			<   572 /*  150 MHz */ >,
+			<   762 /*  200 MHz */ >,
+			<  1144 /*  300 MHz */ >,
+			<  1571 /*  412 MHz */ >,
+			<  2086 /*  547 MHz */ >,
+			<  2597 /*  681 MHz */ >,
+			<  2929 /*  768 MHz */ >,
+			<  3879 /*  1017 MHz */ >,
+			<  4943 /*  1296 MHz */ >,
+			<  5161 /*  1353 MHz */ >,
+			<  5931 /*  1555 MHz */ >,
+			<  6881 /*  1804 MHz */ >;
 	};
 
 	msm_gpu: qcom,kgsl-3d0@5000000 {
@@ -85,26 +90,27 @@
 		/* Bus Scale Settings */
 		qcom,gpubw-dev = <&gpubw>;
 		qcom,bus-control;
-		qcom,bus-width = <16>;
+		/* GPU to BIMC bus width, VBIF data transfer in 1 cycle */
+		qcom,bus-width = <32>;
 		qcom,msm-bus,name = "grp3d";
 		qcom,msm-bus,num-cases = <14>;
 		qcom,msm-bus,num-paths = <1>;
 		qcom,msm-bus,vectors-KBps =
 				<26 512 0 0>,
 
-				<26 512 0 800000>,      /*  1 bus=100  */
-				<26 512 0 1200000>,     /*  2 bus=150  */
-				<26 512 0 1600000>,     /*  3 bus=200  */
-				<26 512 0 2400000>,     /*  4 bus=300  */
-				<26 512 0 3296000>,     /*  5 bus=412  */
-				<26 512 0 4376000>,     /*  6 bus=547  */
-				<26 512 0 5448000>,     /*  7 bus=681  */
-				<26 512 0 6144000>,     /*  8 bus=768  */
-				<26 512 0 8136000>,     /*  9 bus=1017 */
-				<26 512 0 10368000>,    /* 10 bus=1296 */
-				<26 512 0 10824000>,    /* 11 bus=1353 */
-				<26 512 0 12440000>,    /* 12 bus=1555 */
-				<26 512 0 14432000>;    /* 13 bus=1804 */
+				<26 512 0 400000>,     /*  1 bus=100  */
+				<26 512 0 600000>,     /*  2 bus=150  */
+				<26 512 0 800000>,     /*  3 bus=200  */
+				<26 512 0 1200000>,    /*  4 bus=300  */
+				<26 512 0 1648000>,    /*  5 bus=412  */
+				<26 512 0 2188000>,    /*  6 bus=547  */
+				<26 512 0 2724000>,    /*  7 bus=681  */
+				<26 512 0 3072000>,    /*  8 bus=768  */
+				<26 512 0 4068000>,    /*  9 bus=1017 */
+				<26 512 0 5184000>,    /* 10 bus=1296 */
+				<26 512 0 5412000>,    /* 11 bus=1353 */
+				<26 512 0 6220000>,    /* 12 bus=1555 */
+				<26 512 0 7216000>;    /* 13 bus=1804 */
 
 		/* GDSC regulator names */
 		regulator-names = "vddcx", "vdd";
@@ -161,8 +167,8 @@
 			qcom,gpu-pwrlevel@0 {
 				reg = <0>;
 				qcom,gpu-freq = <750000000>;
-				qcom,bus-freq = <12>;
-				qcom,bus-min = <11>;
+				qcom,bus-freq = <13>;
+				qcom,bus-min = <12>;
 				qcom,bus-max = <13>;
 			};
 
@@ -171,7 +177,7 @@
 				reg = <1>;
 				qcom,gpu-freq = <700000000>;
 				qcom,bus-freq = <11>;
-				qcom,bus-min = <10>;
+				qcom,bus-min = <11>;
 				qcom,bus-max = <13>;
 			};
 
@@ -179,7 +185,7 @@
 			qcom,gpu-pwrlevel@2 {
 				reg = <2>;
 				qcom,gpu-freq = <647000000>;
-				qcom,bus-freq = <10>;
+				qcom,bus-freq = <11>;
 				qcom,bus-min = <10>;
 				qcom,bus-max = <12>;
 			};
@@ -188,9 +194,9 @@
 			qcom,gpu-pwrlevel@3 {
 				reg = <3>;
 				qcom,gpu-freq = <588000000>;
-				qcom,bus-freq = <9>;
+				qcom,bus-freq = <10>;
 				qcom,bus-min = <9>;
-				qcom,bus-max = <11>;
+				qcom,bus-max = <12>;
 			};
 
 			/* SVS_L1 */
@@ -198,7 +204,7 @@
 				reg = <4>;
 				qcom,gpu-freq = <465000000>;
 				qcom,bus-freq = <9>;
-				qcom,bus-min = <7>;
+				qcom,bus-min = <8>;
 				qcom,bus-max = <11>;
 			};
 
@@ -206,8 +212,8 @@
 			qcom,gpu-pwrlevel@5 {
 				reg = <5>;
 				qcom,gpu-freq = <370000000>;
-				qcom,bus-freq = <7>;
-				qcom,bus-min = <5>;
+				qcom,bus-freq = <8>;
+				qcom,bus-min = <6>;
 				qcom,bus-max = <9>;
 			};
 
@@ -225,7 +231,7 @@
 				reg = <7>;
 				qcom,gpu-freq = <160000000>;
 				qcom,bus-freq = <3>;
-				qcom,bus-min = <2>;
+				qcom,bus-min = <3>;
 				qcom,bus-max = <5>;
 			};