diff --git a/src/panfrost/ci/panfrost-g610-fails.txt b/src/panfrost/ci/panfrost-g610-fails.txt
index e0bab2db988..166cf610a79 100644
--- a/src/panfrost/ci/panfrost-g610-fails.txt
+++ b/src/panfrost/ci/panfrost-g610-fails.txt
@@ -470,8 +470,6 @@ dEQP-VK.api.info.unsupported_image_usage.optimal.input_attachment_r8g8_snorm,Fai
 dEQP-VK.api.info.unsupported_image_usage.optimal.input_attachment_r8g8b8a8_snorm,Fail
 dEQP-VK.api.info.unsupported_image_usage.optimal.input_attachment_s8_uint,Fail
 
-dEQP-VK.compute.pipeline.device_group.dispatch_base,Fail
-
 dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.multiple_interpolation.separate.no_sample_decoration.1_sample,Fail
 dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.multiple_interpolation.separate.no_sample_decoration.4_samples,Fail
 dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.multiple_interpolation.structured.no_sample_decoration.1_sample,Fail
diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_dispatch.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_dispatch.c
index 7fbf091dc09..2387edc6a42 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_cmd_dispatch.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_dispatch.c
@@ -245,6 +245,9 @@ cmd_dispatch(struct panvk_cmd_buffer *cmdbuf, struct panvk_dispatch_info *info)
    }
 
    struct panvk_compute_sysvals *sysvals = &cmdbuf->state.compute.sysvals;
+   sysvals->base.x = info->baseGroupX;
+   sysvals->base.y = info->baseGroupY;
+   sysvals->base.z = info->baseGroupZ;
    /* If indirect, sysvals->num_work_groups will be written by the CS */
    if (!indirect) {
       sysvals->num_work_groups.x = info->direct.groupCountX;