From: Lionel Landwerlin Date: Mon, 23 Apr 2018 16:52:37 +0000 (+0100) Subject: intel: devinfo: fix assertion on devices with odd number of EUs X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3cdf1bf97db19b94577b49079cbbc521157d4e03;p=mesa.git intel: devinfo: fix assertion on devices with odd number of EUs I forgot to change the assert in the second helper function in a previous change. This hit the assert() on a Broadwell platform with 1 slice, 3 subslices but all EUs disabled in subslice 1 & 2. Fixes: c1900f5b0fb ("intel: devinfo: add helper functions to fill fusing masks values") Signed-off-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke --- diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c index dfeab6e6060..aa72d96e178 100644 --- a/src/intel/dev/gen_device_info.c +++ b/src/intel/dev/gen_device_info.c @@ -1044,11 +1044,7 @@ gen_device_info_update_from_topology(struct gen_device_info *devinfo, for (int b = 0; b < eu_mask_len; b++) n_eus += __builtin_popcount(devinfo->eu_masks[b]); - /* We expect the total number of EUs to be uniformly distributed throughout - * the subslices. - */ - assert(n_subslices && (n_eus % n_subslices) == 0); - devinfo->num_eu_per_subslice = n_eus / n_subslices; + devinfo->num_eu_per_subslice = DIV_ROUND_UP(n_eus, n_subslices); } bool