diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index 3bb7a266775..de199124fb5 100644
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -540,15 +540,15 @@
 
   <struct name="Indexed draw" size="32">
     <field name="Unk 1" size="8" start="0:0" type="hex" default="0x1"/>
-    <field name="Command" size="24" start="0:8" type="hex" default="0x400000"/>
+    <field name="Command" size="8" start="0:24" type="hex" default="0x40"/>
     <field name="Restart index" size="32" start="1:0" type="hex"/>
-    <field name="Unk 2a" size="8" start="2:0" type="hex" default="0x15"/>
     <field name="Primitive" size="8" start="2:8" type="Primitive"/>
     <field name="Restart enable" size="1" start="2:16" type="bool"/> <!-- Metal sets this bit for strips -->
     <field name="Index size" size="3" start="2:17" type="Index size"/>
     <field name="Unk 2c" size="4" start="2:20" type="hex" default="0xF"/>
-    <field name="Unk 2d" size="8" start="2:24" type="hex" default="0x61"/>
-    <field name="Index buffer offset" size="32" start="3:0" type="hex"/>
+    <field name="Draw Command" size="8" start="2:24" type="hex" default="0x61"/>
+    <field name="Index buffer lo" size="32" start="3:0" type="hex"/>
+    <field name="Index buffer hi" size="8" start="2:0" type="hex"/>
     <field name="Index count" size="32" start="4:0" type="uint"/>
     <field name="Instance count" size="32" start="5:0" type="uint"/>
     <field name="Base vertex" size="32" start="6:0" type="uint"/>
diff --git a/src/asahi/lib/decode.c b/src/asahi/lib/decode.c
index 3b9ead210b9..80a35e2c20e 100644
--- a/src/asahi/lib/decode.c
+++ b/src/asahi/lib/decode.c
@@ -465,6 +465,9 @@ agxdecode_cmd(const uint8_t *map, bool verbose)
       agxdecode_stateful(cmd.pipeline, "Pipeline", agxdecode_pipeline, verbose);
       DUMP_UNPACKED(BIND_VERTEX_PIPELINE, cmd, "Bind vertex pipeline\n");
       return AGX_BIND_VERTEX_PIPELINE_LENGTH;
+   } else if (map[3] == 0x40) {
+      DUMP_CL(INDEXED_DRAW, map, "Indexed Draw");
+      return AGX_INDEXED_DRAW_LENGTH;
    } else if (map[3] == 0x61) {
       DUMP_CL(DRAW, map, "Draw");
       return AGX_DRAW_LENGTH;
diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c
index 02d1237540c..514346bd712 100644
--- a/src/gallium/drivers/asahi/agx_state.c
+++ b/src/gallium/drivers/asahi/agx_state.c
@@ -1747,11 +1747,11 @@ agx_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info,
 
       agx_pack(out, INDEXED_DRAW, cfg) {
          cfg.restart_index = info->restart_index;
-         cfg.unk_2a = (ib >> 32);
          cfg.primitive = prim;
          cfg.restart_enable = info->primitive_restart;
          cfg.index_size = __builtin_ctz(idx_size);
-         cfg.index_buffer_offset = (ib & BITFIELD_MASK(32));
+         cfg.index_buffer_lo = (ib & BITFIELD_MASK(32));
+         cfg.index_buffer_hi = (ib >> 32);
          cfg.index_buffer_size = ALIGN_POT(draws->count * idx_size, 4);
          cfg.index_count = draws->count;
          cfg.instance_count = info->instance_count;