diff --git a/.pick_status.json b/.pick_status.json
index 641a6a1b71e..298645f96c9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -34,7 +34,7 @@
         "description": "intel: fix HW generated local-id with indirect compute walker",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "5e7f4ff97fb871376a828146ab3a276c1d3c4fcf",
         "notes": null
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index f32182fefe8..06672b8150c 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -8810,6 +8810,7 @@ static void iris_emit_execute_indirect_dispatch(struct iris_context *ice,
    const struct iris_screen *screen = batch->screen;
    struct iris_compiled_shader *shader =
       ice->shaders.prog[MESA_SHADER_COMPUTE];
+   const struct iris_cs_data *cs_data = iris_cs_data(shader);
    const struct intel_cs_dispatch_info dispatch =
       iris_get_cs_dispatch_info(screen->devinfo, shader, grid->block);
    struct iris_bo *indirect = iris_resource_bo(grid->indirect);
@@ -8818,6 +8819,11 @@ static void iris_emit_execute_indirect_dispatch(struct iris_context *ice,
    struct GENX(COMPUTE_WALKER_BODY) body = {};
    body.SIMDSize            = dispatch_size;
    body.MessageSIMD         = dispatch_size;
+   body.GenerateLocalID     = cs_data->generate_local_id != 0;
+   body.EmitLocal           = cs_data->generate_local_id;
+   body.WalkOrder           = cs_data->walk_order;
+   body.TileLayout          = cs_data->walk_order == INTEL_WALK_ORDER_YXZ ?
+                              TileY32bpe : Linear;
    body.LocalXMaximum       = grid->block[0] - 1;
    body.LocalYMaximum       = grid->block[1] - 1;
    body.LocalZMaximum       = grid->block[2] - 1;
diff --git a/src/intel/vulkan/genX_cmd_compute.c b/src/intel/vulkan/genX_cmd_compute.c
index 7f05139e43f..55ae59c5235 100644
--- a/src/intel/vulkan/genX_cmd_compute.c
+++ b/src/intel/vulkan/genX_cmd_compute.c
@@ -310,6 +310,11 @@ emit_indirect_compute_walker(struct anv_cmd_buffer *cmd_buffer,
       .MessageSIMD              = dispatch_size,
       .IndirectDataStartAddress = comp_state->push_data.offset,
       .IndirectDataLength       = comp_state->push_data.alloc_size,
+      .GenerateLocalID          = prog_data->generate_local_id != 0,
+      .EmitLocal                = prog_data->generate_local_id,
+      .WalkOrder                = prog_data->walk_order,
+      .TileLayout               = prog_data->walk_order == INTEL_WALK_ORDER_YXZ ?
+                                  TileY32bpe : Linear,
       .LocalXMaximum            = prog_data->local_size[0] - 1,
       .LocalYMaximum            = prog_data->local_size[1] - 1,
       .LocalZMaximum            = prog_data->local_size[2] - 1,