Mesa (staging/21.3): intel/dev: fix HSW GT3 number of subslices in slice1

[GitLab Mirror]

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

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Sat Apr  3 13:22:50 2021 +0300

intel/dev: fix HSW GT3 number of subslices in slice1

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10015>
(cherry picked from commit d1db5d562af6cd9447bb564797d67dd27ff95024)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 8b34dc0099b..cb807adb9c6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -112,7 +112,7 @@
         "description": "intel/dev: fix HSW GT3 number of subslices in slice1",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 5cf6e0e7112..7039454b7e7 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -373,7 +373,7 @@ static const struct intel_device_info intel_device_info_hsw_gt2 = {
 static const struct intel_device_info intel_device_info_hsw_gt3 = {
    HSW_FEATURES, .gt = 3,
    .num_slices = 2,
-   .num_subslices = { 2, },
+   .num_subslices = { 2, 2, },
    .num_eu_per_subslice = 10,
    .num_thread_per_eu = 7,
    .l3_banks = 8,