diff --git a/.pick_status.json b/.pick_status.json
index 72e1aa12c93..fac611b5b1e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -204,7 +204,7 @@
         "description": "anv,iris: prefix the argument format with XI for a upcoming refactor",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 95236a79b10..8e999e93de4 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -8640,7 +8640,7 @@ iris_upload_indirect_render_state(struct iris_context *ice,
 
    iris_emit_cmd(batch, GENX(EXECUTE_INDIRECT_DRAW), ind) {
       ind.ArgumentFormat             =
-         draw->index_size > 0 ? DRAWINDEXED : DRAW;
+         draw->index_size > 0 ? XI_DRAWINDEXED : XI_DRAW;
       ind.PredicateEnable            = use_predicate;
       ind.TBIMREnabled               = ice->state.use_tbimr;
       ind.MaxCount                   = indirect->draw_count;
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 8acad6441b3..d299fca9692 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -1669,7 +1669,7 @@
     <field name="DWord Length" start="0" end="7" type="uint" default="4" />
     <field name="Predicate Enable" start="8" end="8" type="bool" />
     <field name="TBIMR Enabled" start="9" end="9" type="uint" />
-    <field name="Argument Format" start="10" end="11" type="uint">
+    <field name="Argument Format" start="10" end="11" type="uint" prefix="XI">
       <value name="DRAW" value="0" />
       <value name="DRAWINDEXED" value="1" />
       <value name="MESH_3D" value="2" />
diff --git a/src/intel/vulkan/genX_cmd_draw.c b/src/intel/vulkan/genX_cmd_draw.c
index 13a7d92d3fd..585488f21ea 100644
--- a/src/intel/vulkan/genX_cmd_draw.c
+++ b/src/intel/vulkan/genX_cmd_draw.c
@@ -1702,7 +1702,7 @@ emit_indirect_draws(struct anv_cmd_buffer *cmd_buffer,
 #if GFX_VERx10 >= 125
          genX(emit_breakpoint)(&cmd_buffer->batch, cmd_buffer->device, true);
          anv_batch_emit(&cmd_buffer->batch, GENX(EXECUTE_INDIRECT_DRAW), ind) {
-            ind.ArgumentFormat             = indexed ? DRAWINDEXED : DRAW;
+            ind.ArgumentFormat             = indexed ? XI_DRAWINDEXED : XI_DRAW;
             ind.TBIMREnabled               = cmd_buffer->state.gfx.dyn_state.use_tbimr;
             ind.PredicateEnable            =
                cmd_buffer->state.conditional_render_enabled;