diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2021-04-03 14:21:32 +0300 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2021-11-05 09:08:41 -0700 |
| commit | c67cc955de4a5cd6b18703cbc7339bd02e0d857c (patch) | |
| tree | d7f0505af26a4974b5c01e46d01a02c68002efef | |
| parent | a675291a820ebac7356b2ac01ca5202f9cf5f775 (diff) | |
| download | mesa-c67cc955de4a5cd6b18703cbc7339bd02e0d857c.tar.gz | |
intel/dev: don't forget to set max_eu_per_subslice in generated topology
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10015>
(cherry picked from commit d7c6a90c26794eff623e8885f92ab27aaa0fe581)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/dev/intel_device_info.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 1e3bf30bc0d..da7bc097606 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -58,7 +58,7 @@ "description": "intel/dev: don't forget to set max_eu_per_subslice in generated topology", "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 80cdf7f2fa1..9360de8f1e4 100644 --- a/src/intel/dev/intel_device_info.c +++ b/src/intel/dev/intel_device_info.c @@ -1081,6 +1081,10 @@ update_from_topology(struct intel_device_info *devinfo, { reset_masks(devinfo); + assert(topology->max_slices > 0); + assert(topology->max_subslices > 0); + assert(topology->max_eus_per_subslice > 0); + devinfo->subslice_slice_stride = topology->subslice_stride; devinfo->eu_subslice_stride = DIV_ROUND_UP(topology->max_eus_per_subslice, 8); @@ -1176,6 +1180,7 @@ update_from_masks(struct intel_device_info *devinfo, uint32_t slice_mask, uint32_t num_eu_per_subslice = DIV_ROUND_UP(n_eus, n_subslices); uint32_t eu_mask = (1U << num_eu_per_subslice) - 1; + topology->max_eus_per_subslice = num_eu_per_subslice; topology->eu_offset = topology->subslice_offset + DIV_ROUND_UP(topology->max_subslices, 8); topology->eu_stride = DIV_ROUND_UP(num_eu_per_subslice, 8); |