Mesa (staging/21.3): intel/devinfo: fix wrong offset computation

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 1fdfc551196cda4c11290b29838a207bb6d44e0c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fdfc551196cda4c11290b29838a207bb6d44e0c

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Fri Jun 25 11:35:10 2021 +0300

intel/devinfo: fix wrong offset computation

A bit difficult to find what commit introduced the issue because of
all the renaming, but it was my bug :)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Cc: mesa-stable
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10015>
(cherry picked from commit 349bfb72752981c9ce276147efaa65ea9d839c57)

---

 .pick_status.json                 | 2 +-
 src/intel/dev/intel_device_info.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index d967218ebab..4cbdc56b70c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -58,7 +58,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 8c3cbe9c47e..2eb5f374909 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1193,7 +1193,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 */