From baa54da7d6026b60ed796df67d5bb72311c9b48a Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Sat, 2 Apr 2022 15:04:05 -0400
Subject: [PATCH] asahi: Relax Draw "command" check

Other values in the lower byte seen with multiple draws and
visibility testing.

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

diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index 074e24088e0..1e43cbc26a7 100644
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -479,7 +479,8 @@
   <struct name="Draw" size="16">
     <field name="Unk" size="8" start="0:0" type="hex" default="0x0"/>
     <field name="Primitive" size="8" start="0:8" type="Primitive"/>
-    <field name="Command" size="16" start="0:16" type="hex" default="0x61c0"/>
+    <field name="Unk 2" size="8" start="0:16" type="hex" default="0xc0"/>
+    <field name="Command" size="8" start="0:24" type="hex" default="0x61"/>
     <field name="Vertex count" size="32" start="1:0" type="uint"/>
     <field name="Instance count" size="32" start="2:0" type="uint"/> <!-- must be nonzero -->
     <field name="Vertex start" size="32" start="3:0" type="uint"/>
diff --git a/src/asahi/lib/decode.c b/src/asahi/lib/decode.c
index feb3693edab..c242b4c7df4 100644
--- a/src/asahi/lib/decode.c
+++ b/src/asahi/lib/decode.c
@@ -398,7 +398,7 @@ agxdecode_cmd(const uint8_t *map, bool verbose)
       agxdecode_stateful(cmd.pipeline, "Pipeline", agxdecode_pipeline, verbose);
       DUMP_UNPACKED(BIND_PIPELINE, cmd, "Bind vertex pipeline\n");
       return AGX_BIND_PIPELINE_LENGTH;
-   } else if (map[2] == 0xc0 && map[3] == 0x61) {
+   } else if (map[3] == 0x61) {
       DUMP_CL(DRAW, map, "Draw");
       return AGX_DRAW_LENGTH;
    } else if (map[2] == 0x00 && map[3] == 0x00) {