Mesa (staging/21.3): intel/dev: fixup chv workaround

[GitLab Mirror]

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

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Tue Jan 11 14:03:47 2022 +0200

intel/dev: fixup chv workaround

We're using the wrong helper to get the subslice total count.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: c24ba6cecbacf2 ("intel/dev: Handle CHV CS thread weirdness in get_device_info_from_fd")
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14492>
(cherry picked from commit d6c0d1679185440a716a2fa00fe2da52f75fe7e4)

---

 .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 1217c982d90..56efb0a45bf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -13,7 +13,7 @@
         "description": "intel/dev: fixup chv workaround",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c24ba6cecbacf2d81345c1112f083006f22b65ea"
     },
diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index a66fadb404e..71155284eaf 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1411,7 +1411,7 @@ fixup_chv_device_info(struct intel_device_info *devinfo)
     * available for that PCI ID and then compute the real value from the
     * subslice information we get from the kernel.
     */
-   const uint32_t subslice_total = intel_device_info_eu_total(devinfo);
+   const uint32_t subslice_total = intel_device_info_subslice_total(devinfo);
    const uint32_t eu_total = intel_device_info_eu_total(devinfo);
 
    /* Logical CS threads = EUs per subslice * num threads per EU */