diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 3beeea937b1..aa61a583a70 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -8834,9 +8834,9 @@ iris_upload_indirect_render_state(struct iris_context *ice,
       if (indirect->buffer) {
          struct iris_bo *bo = iris_resource_bo(indirect->buffer);
          ind.ArgumentBufferStartAddress = ro_bo(bo, indirect->offset);
-         ind.MOCS = iris_mocs(bo, &screen->isl_dev, 0);
+         ind.MOCSIndex = MOCS_GET_INDEX(iris_mocs(bo, &screen->isl_dev, 0));
          } else {
-         ind.MOCS = iris_mocs(NULL, &screen->isl_dev, 0);
+         ind.MOCSIndex = MOCS_GET_INDEX(iris_mocs(NULL, &screen->isl_dev, 0));
       }
 
       if (indirect->indirect_draw_count) {
@@ -9207,8 +9207,8 @@ struct GENX(COMPUTE_WALKER_BODY) body = {
          ind.MaxCount                   = 1;
          ind.body                       = body;
          ind.ArgumentBufferStartAddress = indirect_bo;
-         ind.MOCS                       =
-            iris_mocs(indirect_bo.bo, &screen->isl_dev, 0);
+         ind.MOCSIndex                  =
+            MOCS_GET_INDEX(iris_mocs(indirect_bo.bo, &screen->isl_dev, 0));
       }
    } else {
       if (grid->indirect)
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 1806396192f..74f042c27b6 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -1966,7 +1966,7 @@
   <instruction name="EXECUTE_INDIRECT_DISPATCH" bias="2" length="44" engine="render|compute">
     <field name="DWord Length" dword="0" bits="7:0" type="uint" default="42" />
     <field name="Predicate Enable" dword="0" bits="8:8" type="bool" />
-    <field name="MOCS" dword="0" bits="15:12" type="uint" nonzero="true" />
+    <field name="MOCS Index" dword="0" bits="15:12" type="uint" nonzero="true" />
     <field name="3D Command Sub Opcode" dword="0" bits="23:16" type="uint" default="1" />
     <field name="3D Command Opcode" dword="0" bits="26:24" type="uint" default="4" />
     <field name="Command SubType" dword="0" bits="28:27" type="uint" default="3" />
@@ -1987,7 +1987,7 @@
       <value name="MESH_3D" value="2" />
       <value name="MESH_1D" value="3" />
     </field>
-    <field name="MOCS" dword="0" bits="15:12" type="uint" nonzero="true" />
+    <field name="MOCS Index" dword="0" bits="15:12" type="uint" nonzero="true" />
     <field name="3D Command Sub Opcode" dword="0" bits="23:16" type="uint" default="0" />
     <field name="3D Command Opcode" dword="0" bits="26:24" type="uint" default="4" />
     <field name="Command SubType" dword="0" bits="28:27" type="uint" default="3" />
diff --git a/src/intel/genxml/xe2.xml b/src/intel/genxml/xe2.xml
index a0984f6c450..b71ca73e9f6 100644
--- a/src/intel/genxml/xe2.xml
+++ b/src/intel/genxml/xe2.xml
@@ -1520,7 +1520,7 @@
   <instruction name="EXECUTE_INDIRECT_DISPATCH" bias="2" length="45" engine="render|compute">
     <field name="DWord Length" dword="0" bits="7:0" type="uint" default="43" />
     <field name="Predicate Enable" dword="0" bits="8:8" type="bool" />
-    <field name="MOCS" dword="0" bits="15:12" type="uint" nonzero="true" />
+    <field name="MOCS Index" dword="0" bits="15:12" type="uint" nonzero="true" />
     <field name="3D Command Sub Opcode" dword="0" bits="23:16" type="uint" default="1" />
     <field name="3D Command Opcode" dword="0" bits="26:24" type="uint" default="4" />
     <field name="Command SubType" dword="0" bits="28:27" type="uint" default="3" />
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 0dffadeb66d..df04e16f616 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -7384,7 +7384,7 @@ void genX(cmd_emit_timestamp)(struct anv_batch *batch,
 
       GENX(EXECUTE_INDIRECT_DISPATCH_pack)
       (batch, dwords, &(struct GENX(EXECUTE_INDIRECT_DISPATCH)) {
-            .MOCS = anv_mocs(device, NULL, 0),
+            .MOCSIndex = MOCS_GET_INDEX(anv_mocs(device, NULL, 0)),
             .body = {
                .PostSync = (struct GENX(POSTSYNC_DATA)) {
                   .Operation = WriteTimestamp,
diff --git a/src/intel/vulkan/genX_cmd_compute.c b/src/intel/vulkan/genX_cmd_compute.c
index 4baebe07cce..9df9f8a0334 100644
--- a/src/intel/vulkan/genX_cmd_compute.c
+++ b/src/intel/vulkan/genX_cmd_compute.c
@@ -552,8 +552,8 @@ emit_indirect_compute_walker(struct anv_cmd_buffer *cmd_buffer,
          .MaxCount                   = 1,
          .body                       = body,
          .ArgumentBufferStartAddress = indirect_addr,
-         .MOCS                       = anv_mocs(cmd_buffer->device,
-                                                indirect_addr.bo, 0),
+         .MOCSIndex                  = MOCS_GET_INDEX(anv_mocs(cmd_buffer->device,
+                                                               indirect_addr.bo, 0)),
       );
 
    cmd_buffer_post_dispatch_wa(cmd_buffer);
diff --git a/src/intel/vulkan/genX_cmd_draw.c b/src/intel/vulkan/genX_cmd_draw.c
index 061f7455a55..d86a7a0ef12 100644
--- a/src/intel/vulkan/genX_cmd_draw.c
+++ b/src/intel/vulkan/genX_cmd_draw.c
@@ -2032,8 +2032,8 @@ genX(cmd_buffer_emit_execute_indirect_draws)(struct anv_cmd_buffer *cmd_buffer,
          ind.ArgumentBufferStartAddress = draw;
          ind.CountBufferAddress         = count_addr;
          ind.CountBufferIndirectEnable  = !anv_address_is_null(count_addr);
-         ind.MOCS                       =
-            anv_mocs(cmd_buffer->device, draw.bo, 0);
+         ind.MOCSIndex                  =
+            MOCS_GET_INDEX(anv_mocs(cmd_buffer->device, draw.bo, 0));
 
       }