Mesa (staging/20.1): intel/dev: Split .num_subslices out of GEN12_FEATURES macro

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 7d5074f4a63b6eced3cf3f2a2a8177b78ba20381
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d5074f4a63b6eced3cf3f2a2a8177b78ba20381

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Mon May  4 13:29:32 2020 -0700

intel/dev: Split .num_subslices out of GEN12_FEATURES macro

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:

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

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

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4955>
(cherry picked from commit 54996ad49273641e20dbb2d7aff382199e27cd10)

---

 .pick_status.json               |  2 +-
 src/intel/dev/gen_device_info.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 31a2f7c20a5..e70f0b71bc4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -184,7 +184,7 @@
         "description": "intel/dev: Split .num_subslices out of GEN12_FEATURES macro",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 299d33f9501..447dda7f33a 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -1060,7 +1060,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,                                    \
@@ -1069,17 +1069,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