[DO NOT MERGE ANYWHERE] Revert "arm64/dts: gs101: zuma: Restructure GPU SLC partitions"

Revert submission 2720133-gpu-slcv2

Reason for revert: Prebuild did not land before cutoff

Reverted changes: /q/submissionid:2720133-gpu-slcv2
Bug: 329447972

Change-Id: If5f5ca9e7206c3db4edb017f218a7f45632de76a

4 files changed, 136 insertions, 6 deletions

diff --git a/arch/arm64/boot/dts/google/gs101-gpu.dtsi b/arch/arm64/boot/dts/google/gs101-gpu.dtsi
index 479802e3b..3019fc109 100644
--- a/arch/arm64/boot/dts/google/gs101-gpu.dtsi
+++ b/arch/arm64/boot/dts/google/gs101-gpu.dtsi
@@ -10,8 +10,33 @@
 	mali_mgm: physical-memory-group-manager {
 		compatible = "arm,physical-memory-group-manager";
 
+		/* Memory groups */
+		groups =
+			"gpu_g0",
+			"gpu_g1";
+
+		/* Base partition index for each group */
+		group_base_pt = <0 10>;
+
+		/* Number of partitions for each group */
+		group_pt_num = <10 1>;
+
 		/* SLC partitions */
-		pt_id = "gpu_write_alloc";
+		pt_id =
+			"gpu_g0_p0",
+			"gpu_g0_p1",
+			"gpu_g0_p2",
+			"gpu_g0_p3",
+			"gpu_g0_p4",
+			"gpu_g0_p5",
+			"gpu_g0_p6",
+			"gpu_g0_p7",
+			"gpu_g0_p8",
+			"gpu_g0_p9",
+			"gpu_g1_p0";
+
+		/* SLC partition sizes KB */
+		pt_size = <256 512 768 1024 1536 2048 3072 4096 6144 8192 8192>;
 	};
 
 	mali_pcm: priority-control-manager {
diff --git a/arch/arm64/boot/dts/google/gs101.dtsi b/arch/arm64/boot/dts/google/gs101.dtsi
index fbde1d24b..1cd0e1c77 100644
--- a/arch/arm64/boot/dts/google/gs101.dtsi
+++ b/arch/arm64/boot/dts/google/gs101.dtsi
@@ -536,9 +536,49 @@
 		 *     bit[6]   don't force optimal fetch on read  (0)
 		 *     bit[7]   don't force optimal fetch on write (0)
 		 */
-		gpu_write_alloc {
+		gpu_g0_p0 {
+			/* vptid 40, max size 256KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x00001001 0x0 0x5>;
+		};
+		gpu_g0_p1 {
+			/* vptid 40, max size 512KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x00005001 0x0 0x5>;
+		};
+		gpu_g0_p2 {
+			/* vptid 40, max size 768KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x0000d001 0x0 0x5>;
+		};
+		gpu_g0_p3 {
+			/* vptid 40, max size 1024KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x0001d001 0x0 0x5>;
+		};
+		gpu_g0_p4 {
+			/* vptid 40, max size 1536KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x0003d001 0x0 0x5>;
+		};
+		gpu_g0_p5 {
+			/* vptid 40, max size 2048KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x0007d001 0x0 0x5>;
+		};
+		gpu_g0_p6 {
+			/* vptid 40, max size 3072KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x000fd001 0x0 0x5>;
+		};
+		gpu_g0_p7 {
+			/* vptid 40, max size 4096KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x001fd001 0x0 0x5>;
+		};
+		gpu_g0_p8 {
+			/* vptid 40, max size 6144KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x003fd001 0x0 0x5>;
+		};
+		gpu_g0_p9 {
 			/* vptid 40, max size 8192KB, priority 0, pbha 5 */
-			id_size_priority = <0x28 0xffffffff 0x0 0x5>;
+			id_size_priority = <0x28 0x007fd001 0x0 0x5>;
+		};
+		gpu_g1_p0 {
+			/* vptid 2, max size 8192KB, priority 0, pbha 6 */
+			id_size_priority = <0x2 0xffffffff 0x0 0x6>;
 		};
 		CAMERA2WAY {
 			/* vptid 3, size 512KB, priority 0 (highest), pbha 0 */
diff --git a/arch/arm64/boot/dts/google/zuma-gpu.dtsi b/arch/arm64/boot/dts/google/zuma-gpu.dtsi
index 38deafb36..91ee49c73 100644
--- a/arch/arm64/boot/dts/google/zuma-gpu.dtsi
+++ b/arch/arm64/boot/dts/google/zuma-gpu.dtsi
@@ -10,8 +10,33 @@
 	mali_mgm: physical-memory-group-manager {
 		compatible = "arm,physical-memory-group-manager";
 
+		/* Memory groups */
+		groups =
+			"gpu_g0",
+			"gpu_g1";
+
+		/* Base partition index for each group */
+		group_base_pt = <0 10>;
+
+		/* Number of partitions for each group */
+		group_pt_num = <10 1>;
+
 		/* SLC partitions */
-		pt_id = "gpu_write_alloc";
+		pt_id =
+			"gpu_g0_p0",
+			"gpu_g0_p1",
+			"gpu_g0_p2",
+			"gpu_g0_p3",
+			"gpu_g0_p4",
+			"gpu_g0_p5",
+			"gpu_g0_p6",
+			"gpu_g0_p7",
+			"gpu_g0_p8",
+			"gpu_g0_p9",
+			"gpu_g1_p0";
+
+		/* SLC partition sizes KB */
+		pt_size = <512 1024 1536 2048 3072 4096 6144 8192 12288 16384 16384>;
 	};
 
 	mali_pma: protected-memory-allocator {
diff --git a/arch/arm64/boot/dts/google/zuma.dtsi b/arch/arm64/boot/dts/google/zuma.dtsi
index d079f4a87..1276e5f84 100644
--- a/arch/arm64/boot/dts/google/zuma.dtsi
+++ b/arch/arm64/boot/dts/google/zuma.dtsi
@@ -573,9 +573,49 @@
 		 *     bit[6]   don't force optimal fetch on read  (0)
 		 *     bit[7]   don't force optimal fetch on write (0)
 		 */
-		gpu_write_alloc {
+		gpu_g0_p0 {
+			/* vptid 40, max size 512KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x00001001 0x0 0x5>;
+		};
+		gpu_g0_p1 {
+			/* vptid 40, max size 1024KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x00005001 0x0 0x5>;
+		};
+		gpu_g0_p2 {
+			/* vptid 40, max size 1536KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x0000d001 0x0 0x5>;
+		};
+		gpu_g0_p3 {
+			/* vptid 40, max size 2048KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x0001d001 0x0 0x5>;
+		};
+		gpu_g0_p4 {
+			/* vptid 40, max size 3072KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x0003d001 0x0 0x5>;
+		};
+		gpu_g0_p5 {
+			/* vptid 40, max size 4096KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x0007d001 0x0 0x5>;
+		};
+		gpu_g0_p6 {
+			/* vptid 40, max size 6144KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x000fd001 0x0 0x5>;
+		};
+		gpu_g0_p7 {
+			/* vptid 40, max size 8192KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x001fd001 0x0 0x5>;
+		};
+		gpu_g0_p8 {
+			/* vptid 40, max size 12288KB, priority 0, pbha 5 */
+			id_size_priority = <0x28 0x003fd001 0x0 0x5>;
+		};
+		gpu_g0_p9 {
 			/* vptid 40, max size 16384KB, priority 0, pbha 5 */
-			id_size_priority = <0x28 0xffffffff 0x0 0x5>;
+			id_size_priority = <0x28 0x007fd001 0x0 0x5>;
+		};
+		gpu_g1_p0 {
+			/* vptid 2, max size 16384KB, priority 0, pbha 6 */
+			id_size_priority = <0x2 0xffffffff 0x0 0x6>;
 		};
 		CAMERA1WAY0 {
 			/* vptid 3, size 512KB, priority 0 (highest), pbha 0 */