arm64/dts: gs101: zuma: Restructure GPU SLC partitions am: a4fff465bc

Original change: https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/2753515

Change-Id: Idacd52547fd7be8cfde6e994121e6e98617c3c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4 files changed, 6 insertions, 136 deletions

diff --git a/arch/arm64/boot/dts/google/gs101-gpu.dtsi b/arch/arm64/boot/dts/google/gs101-gpu.dtsi
index a1f94dc2f9d9..23a887b0bf70 100644
--- a/arch/arm64/boot/dts/google/gs101-gpu.dtsi
+++ b/arch/arm64/boot/dts/google/gs101-gpu.dtsi
@@ -10,33 +10,8 @@
 	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_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>;
+		pt_id = "gpu_write_alloc";
 	};
 
 	mali_pcm: priority-control-manager {
diff --git a/arch/arm64/boot/dts/google/gs101.dtsi b/arch/arm64/boot/dts/google/gs101.dtsi
index 0cbea9189217..0ed47afc9779 100644
--- a/arch/arm64/boot/dts/google/gs101.dtsi
+++ b/arch/arm64/boot/dts/google/gs101.dtsi
@@ -548,49 +548,9 @@
 		 *     bit[6]   don't force optimal fetch on read  (0)
 		 *     bit[7]   don't force optimal fetch on write (0)
 		 */
-		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 {
+		gpu_write_alloc {
 			/* vptid 40, max size 8192KB, priority 0, pbha 5 */
-			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>;
+			id_size_priority = <0x28 0xffffffff 0x0 0x5>;
 		};
 		CAMERA2WAY {
 			/* vptid 3, size 512KB, priority 0 (highest), pbha 0 */
diff --git a/arch/arm64/boot/dts/google/gs201-gpu.dtsi b/arch/arm64/boot/dts/google/gs201-gpu.dtsi
index cec3a2dddc26..6b8c7a7b6fc3 100644
--- a/arch/arm64/boot/dts/google/gs201-gpu.dtsi
+++ b/arch/arm64/boot/dts/google/gs201-gpu.dtsi
@@ -10,33 +10,8 @@
 	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_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>;
+		pt_id = "gpu_write_alloc";
 	};
 
 	mali_pcm: priority-control-manager {
diff --git a/arch/arm64/boot/dts/google/gs201.dtsi b/arch/arm64/boot/dts/google/gs201.dtsi
index be268234bd7a..f4d95191f9d2 100644
--- a/arch/arm64/boot/dts/google/gs201.dtsi
+++ b/arch/arm64/boot/dts/google/gs201.dtsi
@@ -610,49 +610,9 @@
 		 *     bit[6]   don't force optimal fetch on read  (0)
 		 *     bit[7]   don't force optimal fetch on write (0)
 		 */
-		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 {
+		gpu_write_alloc {
 			/* vptid 40, max size 8192KB, priority 0, pbha 5 */
-			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>;
+			id_size_priority = <0x28 0xffffffff 0x0 0x5>;
 		};
 		CAMERA2WAY {
 			/* vptid 3, size 512KB, priority 0 (highest), pbha 0 */