asahi: Identify ZLS Control word from PowerVR

We're into the cr.xml file now, which is the blob that gets passed
through the kernel.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18623>

diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index 5be63d7..b459a1e 100644 (file)
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -736,6 +736,27 @@
     <field name="Percent" start="5:16" size="16" type="uint"/>
   </struct>
 
+  <enum name="ZLS Format">
+    <value name="32F" value="0"/>
+    <value name="16" value="2"/>
+  </enum>
+
+  <struct name="ZLS Control" size="8">
+    <field name="Unknown 0" start="0" size="1" type="bool"/>
+    <field name="Unknown 1" start="1" size="1" type="bool"/>
+    <field name="Unknown 2" start="2" size="1" type="bool"/>
+    <field name="Unknown 3" start="3" size="1" type="bool"/>
+    <field name="Unknown 4" start="4" size="1" type="bool"/>
+    <field name="Unknown 5" start="5" size="1" type="bool"/>
+    <field name="Unknown 6" start="6" size="1" type="bool"/>
+    <field name="Unknown 7" start="7" size="1" type="bool"/>
+    <field name="S Load Enable" start="14" size="1" type="bool"/>
+    <field name="Z Load Enable" start="15" size="1" type="bool"/>
+    <field name="S Store Enable" start="18" size="1" type="bool"/>
+    <field name="Z Store Enable" start="19" size="1" type="bool"/>
+    <field name="Z Format" start="25" size="2" type="ZLS Format"/>
+  </struct>
+
   <struct name="IOGPU Internal Pipelines" size="272">
     <field name="Clear pipeline bind" start="2:0" size="32" type="hex"/>
     <field name="Clear pipeline unk" start="4:0" size="4" default="4" type="hex"/>
@@ -745,15 +766,7 @@
     <field name="Store pipeline" start="12:4" size="28" type="address" modifier="shr(4)"/>
     <field name="Scissor array" start="14:0" size="64" type="address"/>
     <field name="Depth bias array" start="16:0" size="64" type="address"/>
-    <!-- 0xc0154 with depth clear and z32f and s8
-         0x40154 with z32f and s8
-         0x44 with z32f
-         0x4000044 with z16?
-    -->
-    <field name="Depth flags" start="20:0" size="32" type="hex"/>
-    <field name="Depth compression" start="20:6" size="1" type="bool"/>
-    <field name="Depth reload" start="20:15" size="1" type="bool"/>
-    <field name="Depth format 16 unorm" start="20:26" size="1" type="bool"/>
+    <field name="ZLS control" start="20:0" size="32" type="ZLS Control"/>
     <field name="Depth width" start="26:0" size="15" type="uint" default="1" modifier="minus(1)"/>
     <field name="Depth height" start="26:15" size="15" type="uint" default="1" modifier="minus(1)"/>
     <field name="Depth buffer (if clearing)" start="28:7" size="33" type="address" modifier="shr(7)"/>

diff --git a/src/gallium/drivers/asahi/magic.c b/src/gallium/drivers/asahi/magic.c
index 9683b6b..767001b 100644 (file)
--- a/src/gallium/drivers/asahi/magic.c
+++ b/src/gallium/drivers/asahi/magic.c
@@ -207,21 +207,20 @@ demo_cmdbuf(uint64_t *buf, size_t size,
          if (util_format_has_depth(desc)) {
             depth_buffer = agx_map_surface(zsbuf);
 
-            cfg.depth_reload = !should_clear_depth;
-            cfg.depth_flags |= 0x80000;
-            if (!should_clear_depth) cfg.depth_flags |= 0x8000;
+            cfg.zls_control.z_store_enable = true;
+            cfg.zls_control.z_load_enable = !should_clear_depth;
          } else {
             stencil_buffer = agx_map_surface(zsbuf);
-            cfg.depth_flags |= 0x40000;
-            if (!should_clear_stencil) cfg.depth_flags |= 0x4000;
+            cfg.zls_control.s_store_enable = true;
+            cfg.zls_control.s_load_enable = !should_clear_stencil;
          }
 
          if (agx_resource(zsbuf->texture)->separate_stencil) {
             stencil_buffer = agx_map_surface_resource(zsbuf,
                   agx_resource(zsbuf->texture)->separate_stencil);
 
-            cfg.depth_flags |= 0x40000;
-            if (!should_clear_stencil) cfg.depth_flags |= 0x4000;
+            cfg.zls_control.s_store_enable = true;
+            cfg.zls_control.s_load_enable = !should_clear_stencil;
          }
 
          cfg.depth_buffer_if_clearing = depth_buffer;