diff --git a/.pick_status.json b/.pick_status.json
index 4694d8bb54d..e5607302112 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -9894,7 +9894,7 @@
         "description": "panfrost: fix debug print of spilled registers",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "6c64ad934f76dc142926c7a1261ac94d80dca0a9",
         "notes": null
diff --git a/src/panfrost/compiler/bi_printer.c.py b/src/panfrost/compiler/bi_printer.c.py
index 833805d2276..944250d738a 100644
--- a/src/panfrost/compiler/bi_printer.c.py
+++ b/src/panfrost/compiler/bi_printer.c.py
@@ -95,10 +95,10 @@ bi_print_index(FILE *fp, bi_index index)
         fprintf(fp, "_");
     else if (index.type == BI_INDEX_CONSTANT)
         fprintf(fp, "#0x%x", index.value);
-    else if (index.type == BI_INDEX_FAU && index.value >= BIR_FAU_UNIFORM)
-        fprintf(fp, "u%u", index.value & ~BIR_FAU_UNIFORM);
     else if (index.type == BI_INDEX_FAU && index.memory)
         fprintf(fp, "m%u", index.value);
+    else if (index.type == BI_INDEX_FAU && index.value >= BIR_FAU_UNIFORM)
+        fprintf(fp, "u%u", index.value & ~BIR_FAU_UNIFORM);
     else if (index.type == BI_INDEX_FAU)
         fprintf(fp, "%s", bir_fau_name(index.value));
     else if (index.type == BI_INDEX_PASS)