Mesa (staging/20.1): intel/dev: Don't consider all TGL SKUs as GT1 only

[GitLab Mirror]

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

Author: Satyeshwar Singh <satyeshwar.singh at intel.com>
Date:   Thu May 28 00:44:26 2020 -0700

intel/dev: Don't consider all TGL SKUs as GT1 only

We should be passing _gt instead of 1 to GEN12_FEATURES or else all TGL
SKUs will be considered as gt1 only.

Fixes: 54996ad4927 ("intel/dev: Split .num_subslices out of GEN12_FEATURES macro")
Signed-off-by: Satyeshwar Singh <satyeshwar.singh at intel.com>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5261>
(cherry picked from commit aaec065f03e65f75fd18f8cc24d003f220209714)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 6388ae33a65..55fb89048b7 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13,7 +13,7 @@
         "description": "intel/dev: Don't consider all TGL SKUs as GT1 only",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "54996ad49273641e20dbb2d7aff382199e27cd10"
     },
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 1f8ce9a0d11..5fca67d9467 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -1079,7 +1079,7 @@ static const struct gen_device_info gen_device_info_ehl_4 = {
    .num_subslices = dual_subslices(1)
 
 #define GEN12_GT_FEATURES(_gt)                                  \
-   GEN12_FEATURES(1, 1, _gt == 1 ? 4 : 8),                      \
+   GEN12_FEATURES(_gt, 1, _gt == 1 ? 4 : 8),                    \
    .num_subslices = dual_subslices(_gt == 1 ? 2 : 6)
 
 static const struct gen_device_info gen_device_info_tgl_gt1 = {