From 2cc88430f1f857e5deb5e31407ede5328b387d85 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Thu, 9 Jan 2025 15:22:56 -0500
Subject: [PATCH] asahi: rename Null layout

this isn't a Null layout only, it's also used with sparse. update the name to
reduce confusion. Unsure if we have a use case yet but maybe as an optimization
later?

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33682>
---
 src/asahi/genxml/cmdbuf.xml | 4 ++--
 src/asahi/lib/agx_helpers.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/asahi/genxml/cmdbuf.xml b/src/asahi/genxml/cmdbuf.xml
index 06e90725dba..fac01bcaba0 100644
--- a/src/asahi/genxml/cmdbuf.xml
+++ b/src/asahi/genxml/cmdbuf.xml
@@ -77,8 +77,8 @@
 
   <enum name="Layout">
     <value name="Linear" value="0"/>
-    <!-- Default layout if no other layout is set -->
-    <value name="Null" value="1"/>
+    <!-- Needs investigation, blob uses this with sparse -->
+    <value name="Tiled" value="1"/>
     <!-- Morton order -->
     <value name="Twiddled" value="2"/>
     <!-- With a metadata buffer -->
diff --git a/src/asahi/lib/agx_helpers.h b/src/asahi/lib/agx_helpers.h
index fbb9b3dd4f6..d271feb0fee 100644
--- a/src/asahi/lib/agx_helpers.h
+++ b/src/asahi/lib/agx_helpers.h
@@ -172,7 +172,7 @@ static void
 agx_set_null_texture(struct agx_texture_packed *tex, uint64_t valid_address)
 {
    agx_pack(tex, TEXTURE, cfg) {
-      cfg.layout = AGX_LAYOUT_NULL;
+      cfg.layout = AGX_LAYOUT_TILED;
       cfg.channels = AGX_CHANNELS_R8;
       cfg.type = AGX_TEXTURE_TYPE_UNORM /* don't care */;
       cfg.swizzle_r = AGX_CHANNEL_0;
@@ -191,7 +191,7 @@ agx_set_null_pbe(struct agx_pbe_packed *pbe, uint64_t sink)
       cfg.width = 1;
       cfg.height = 1;
       cfg.levels = 1;
-      cfg.layout = AGX_LAYOUT_NULL;
+      cfg.layout = AGX_LAYOUT_TILED;
       cfg.channels = AGX_CHANNELS_R8;
       cfg.type = AGX_TEXTURE_TYPE_UNORM /* don't care */;
       cfg.swizzle_r = AGX_CHANNEL_R;