drm/asahi: g17: add the T6040 (M4 Pro) GPU as a Neo-style target

Documentation/devicetree/bindings/gpu/apple,agx.yaml

@@ -17,6 +17,7 @@ properties:
           - apple,agx-g13s
           - apple,agx-g14g
           - apple,agx-g14s
+          - apple,agx-t6040
           - apple,agx-t8132
           - apple,agx-t8140
       - items:
@@ -51,8 +52,12 @@ properties:
       - description:
           Region containing a shared handoff structure for VM
           management coordination
-      - description: Power calibration blob or firmware shared-L2 page
-      - description: GPU calibration blob or preserved firmware text
+      - description:
+          Power calibration blob, firmware shared-L2 page or firmware data
+          segment
+      - description:
+          GPU calibration blob, preserved firmware text or firmware
+          kernel-window page tables
       - description: Shared global variables or preserved firmware data
 
   memory-region-names:
@@ -61,8 +66,8 @@ properties:
       - const: ttbs
       - const: pagetables
       - const: handoff
-      - enum: [hw-cal-a, shared-l2]
-      - enum: [hw-cal-b, fw-text]
+      - enum: [hw-cal-a, shared-l2, fw-data]
+      - enum: [hw-cal-b, fw-text, l2-pagetables]
       - enum: [globals, fw-data]
 
   apple,pmp:
@@ -71,6 +76,26 @@ properties:
 
   operating-points-v2: true
 
+  apple,firmware-version:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    maxItems: 3
+    description:
+      macOS version (major, minor, patch) whose boot firmware loaded the GPU
+      firmware, which identifies the firmware build. Filled in by the boot
+      loader.
+
+  apple,cs-opp:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description:
+      Operating-point table of the GPU's CS clock domain, one voltage cell per
+      state.
+
+  apple,afr-opp:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description:
+      Operating-point table of the GPU's AFR clock domain, one voltage cell
+      per state.
+
   apple,firmware-abi:
     $ref: /schemas/types.yaml#/definitions/uint32-array
     minItems: 3
@@ -121,20 +146,45 @@ allOf:
     else:
       properties:
         apple,pmp: false
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: apple,agx-t8140
+    then:
+      properties:
+        reg:
+          items:
+            - description: GFX coprocessor control registers
+            - description: GPU block MMIO registers
+        reg-names:
+          items:
+            - const: asc
+            - const: sgx
+        mboxes:
+          items:
+            - description: GFX coprocessor mailbox
+            - description: GFX1 coprocessor mailbox
+        memory-region:
+          items:
+            - description: Region containing GPU MMU TTBs
+            - description: Region containing GPU MMU page tables
+            - description:
+                Region containing a shared handoff structure for VM
+                management coordination
         memory-region-names:
-          minItems: 3
           items:
             - const: ttbs
             - const: pagetables
             - const: handoff
-            - const: hw-cal-a
-            - const: hw-cal-b
-            - const: globals
+      required:
+        - power-domains
+        - operating-points-v2
   - if:
       properties:
         compatible:
           contains:
-            const: apple,agx-t8140
+            const: apple,agx-t6040
     then:
       properties:
         reg:
@@ -148,39 +198,64 @@ allOf:
         mboxes:
           items:
             - description: GFX coprocessor mailbox
-            - description: GFX1 coprocessor mailbox
         memory-region:
-          maxItems: 3
+          items:
+            - description: Region containing GPU MMU TTBs
+            - description: Region containing GPU MMU page tables
+            - description:
+                Region containing a shared handoff structure for VM
+                management coordination
+            - description:
+                Data segment of the loaded GPU firmware, where the firmware
+                places its crash log
+            - description:
+                Region in which the GPU firmware builds the page tables of
+                its kernel window
         memory-region-names:
-          maxItems: 3
+          items:
+            - const: ttbs
+            - const: pagetables
+            - const: handoff
+            - const: fw-data
+            - const: l2-pagetables
       required:
         - power-domains
         - operating-points-v2
-    else:
-      if:
+        - apple,cs-opp
+        - apple,afr-opp
+  - if:
+      not:
         properties:
           compatible:
-            not:
-              contains:
-                const: apple,agx-t8132
-      then:
-        properties:
-          reg:
-            items:
-              - description: GPU coprocessor control registers
-              - description: GPU block MMIO registers
-          reg-names:
-            items:
-              - const: asc
-              - const: sgx
-          mboxes:
-            maxItems: 1
-          memory-region:
-            minItems: 6
-          memory-region-names:
-            minItems: 6
-        required:
-          - apple,firmware-abi
+            contains:
+              enum:
+                - apple,agx-t6040
+                - apple,agx-t8132
+                - apple,agx-t8140
+    then:
+      properties:
+        reg:
+          items:
+            - description: GPU coprocessor control registers
+            - description: GPU block MMIO registers
+        reg-names:
+          items:
+            - const: asc
+            - const: sgx
+        mboxes:
+          maxItems: 1
+        memory-region:
+          minItems: 6
+        memory-region-names:
+          items:
+            - const: ttbs
+            - const: pagetables
+            - const: handoff
+            - const: hw-cal-a
+            - const: hw-cal-b
+            - const: globals
+      required:
+        - apple,firmware-abi
 
 additionalProperties: false
 

Documentation/devicetree/bindings/mailbox/apple,ascwrap-v6.yaml

@@ -4,20 +4,23 @@
 $id: http://devicetree.org/schemas/mailbox/apple,ascwrap-v6.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Apple T8140 ASCWrap v6 mailbox
+title: Apple ASCWrap v6 GPU mailbox
 
 maintainers:
   - Ryan Murray <ryan@aurorasilicon.org>
 
 description:
-  Mailbox interface of the T8140 GPU coprocessors. The wrapper resource
-  contains the coprocessor control registers and mailbox FIFOs. A separate
-  resource provides the coprocessor vector-base register. The firmware role
-  identifies which of the two GPU firmware instances uses the mailbox.
+  Mailbox interface of the GPU coprocessors of the T8140 and T6040. The
+  wrapper resource contains the coprocessor control registers and mailbox
+  FIFOs. A separate resource provides the coprocessor vector-base register.
+  The firmware role identifies which GPU firmware instance uses the mailbox;
+  the T6040 runs a single one.
 
 properties:
   compatible:
-    const: apple,t8140-ascwrap-v6
+    enum:
+      - apple,t6040-ascwrap-v6
+      - apple,t8140-ascwrap-v6
 
   reg:
     items:
@@ -57,6 +60,17 @@ required:
   - '#mbox-cells'
   - apple,firmware-role
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: apple,t6040-ascwrap-v6
+    then:
+      properties:
+        apple,firmware-role:
+          const: GFX
+
 additionalProperties: false
 
 examples: