intel/dev/xe: Move placeholder subslice info into XEHP_FEATURES

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/24418>

diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 665f195..e90824e 100644 (file)
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1064,6 +1064,7 @@ static const struct intel_device_info intel_device_info_sg1 = {
    .has_64bit_int = false,                                      \
    .has_integer_dword_mul = false,                              \
    .gt = _gt, .num_slices = _slices, .l3_banks = _l3,           \
+   .num_subslices = dual_subslices(1), /* updated by topology */\
    .ver = 12,                                                   \
    .has_pln = false,                                            \
    .has_sample_with_hiz = false,                                \
@@ -1091,7 +1092,6 @@ static const struct intel_device_info intel_device_info_sg1 = {
    XEHP_FEATURES(0, 1, 0),                                      \
    .display_ver = 13,                                           \
    .revision = 4, /* For offline compiler */                    \
-   .num_subslices = dual_subslices(1),                          \
    .apply_hwconfig = true,                                      \
    .has_coarse_pixel_primitive_and_cb = true,                   \
    .has_mesh_shading = true,                                    \
@@ -1126,7 +1126,6 @@ static const struct intel_device_info intel_device_info_atsm_g11 = {
 #define MTL_FEATURES                                            \
    /* (Sub)slice info comes from the kernel topology info */    \
    XEHP_FEATURES(0, 1, 0),                                      \
-   .num_subslices = dual_subslices(1),                          \
    .has_local_mem = false,                                      \
    .has_aux_map = true,                                         \
    .apply_hwconfig = true,                                      \