diff --git a/.pick_status.json b/.pick_status.json
index 890e08deba5..2552efd3917 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1120,7 +1120,7 @@
         "description": "intel/devinfo: fix wrong offset computation",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 8ac93955c53..a66fadb404e 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1145,7 +1145,7 @@ update_from_masks(struct intel_device_info *devinfo, uint32_t slice_mask,
 
    topology->max_eus_per_subslice = num_eu_per_subslice;
    topology->eu_offset = topology->subslice_offset +
-      DIV_ROUND_UP(topology->max_subslices, 8);
+      topology->max_slices * DIV_ROUND_UP(topology->max_subslices, 8);
    topology->eu_stride = DIV_ROUND_UP(num_eu_per_subslice, 8);
 
    /* Set slice mask in topology */