fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 20:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/dev: Split .num_subslices out of GEN12_FEATURES macro

Browse source 
The .num_subslices field makes it problematic to reuse the
GEN12_FEATURES macro in other macros.

This also fixes the number of L3 banks for tgl gt1, except that this
was already fixed by Jason (dynamically) in:

86f67952d3 ("intel/devinfo: Compute the correct L3$ size for Gen12")

Cc: 20.1 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by : Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4955>
This commit is contained in:
Jordan Justen 2020-05-04 13:29:32 -07:00 • committed by Marge Bot
parent 07b0fbea92
commit 54996ad492
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/intel/dev/gen_device_info.c
View file

@ -1040,7 +1040,7 @@ static const struct gen_device_info gen_device_info_ehl_4 = {
GEN12_URB_MIN_MAX_ENTRIES, \
}
#define GEN12_FEATURES(_gt, _slices, _dual_subslices, _l3) \
#define GEN12_FEATURES(_gt, _slices, _l3) \
GEN8_FEATURES, \
GEN12_HW_INFO, \
.has_64bit_float = false, \
@ -1049,17 +1049,20 @@ static const struct gen_device_info gen_device_info_ehl_4 = {
.gt = _gt, .num_slices = _slices, .l3_banks = _l3, \
.simulator_id = 22, \
.urb.size = (_gt) == 1 ? 512 : 1024, \
.num_subslices = _dual_subslices, \
.num_eu_per_subslice = 16
#define dual_subslices(args...) { args, }
#define GEN12_GT_FEATURES(_gt) \
GEN12_FEATURES(1, 1, _gt == 1 ? 4 : 8), \
.num_subslices = dual_subslices(_gt == 1 ? 2 : 6)
static const struct gen_device_info gen_device_info_tgl_gt1 = {
GEN12_FEATURES(1, 1, dual_subslices(2), 8),
GEN12_GT_FEATURES(1),
};
static const struct gen_device_info gen_device_info_tgl_gt2 = {
GEN12_FEATURES(2, 1, dual_subslices(6), 8),
GEN12_GT_FEATURES(2),
};
static void