summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2021-06-25 11:35:10 +0300
committerDylan Baker <dylan.c.baker@intel.com>2021-11-24 15:47:19 -0800
commitca5a31432c64d5b7d49729cc21475b438766e521 (patch)
tree3b243b8ce8fd3cbda4bc4985faf485985ec6d149
parentfdc53e0ae6a4445efd4738f39d1cd1c3ab0fca9d (diff)
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@intel.com> Cc: mesa-stable Reviewed-by: Francisco Jerez <currojerez@riseup.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10015> (cherry picked from commit 349bfb72752981c9ce276147efaa65ea9d839c57)
-rw-r--r--.pick_status.json2
-rw-r--r--src/intel/dev/intel_device_info.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index a65e24f7cd7..b1d833a51b1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13,7 +13,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 9360de8f1e4..7e072479dcb 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1182,7 +1182,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 */