From c8435e4bc65bc3a96cc0aa66fbfb125b00be6b83 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Sat, 20 Aug 2022 13:10:49 -0400
Subject: [PATCH] asahi: Rename 'tiled 64x64' to 'twiddled'

To account for non-64x64 tile sizes, as well as the other forms of
tiling that may come up with compression.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18167>
---
 src/asahi/lib/cmdbuf.xml              | 6 +++---
 src/gallium/drivers/asahi/agx_state.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index 278439aa6ec..9d8ec2f3f44 100644
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -69,8 +69,8 @@
     <value name="Linear" value="0"/>
     <!-- Default layout if no other layout is set -->
     <value name="Null" value="1"/>
-    <!-- Morton order with 64x64 tiles -->
-    <value name="Tiled 64x64" value="2"/>
+    <!-- Morton order -->
+    <value name="Twiddled" value="2"/>
     <!-- With a metadata buffer -->
     <value name="Compressed" value="3"/>
   </enum>
@@ -222,7 +222,7 @@
     <field name="Unk mipmapped" size="1" start="102" type="bool"/>
     <!-- This is set when no texture is bound, with layout 1 -->
     <field name="Null" size="1" start="105" type="bool"/>
-    <field name="Compression" size="2" start="106" type="hex"/> <!-- 0 for 64x64 tiling -->
+    <field name="Compression" size="2" start="106" type="hex"/> <!-- 0 for uncompressed -->
     <field name="sRGB" size="1" start="108" type="bool"/>
     <field name="Unk 2" size="1" start="109" type="bool"/>
     <field name="Stride" size="18" start="110" type="hex" modifier="shr(4)"/>
diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c
index 48929791b51..b0612ba3c95 100644
--- a/src/gallium/drivers/asahi/agx_state.c
+++ b/src/gallium/drivers/asahi/agx_state.c
@@ -409,7 +409,7 @@ agx_translate_layout(uint64_t modifier)
 {
    switch (modifier) {
    case DRM_FORMAT_MOD_APPLE_64X64_MORTON_ORDER:
-      return AGX_LAYOUT_TILED_64X64;
+      return AGX_LAYOUT_TWIDDLED;
    case DRM_FORMAT_MOD_LINEAR:
       return AGX_LAYOUT_LINEAR;
    default: