intel/dev: Fix warning for max_threads_per_psd when devinfo->verx10 == 120

Although we don't want to rely on hwconfig for devinfo->verx10 == 120,
due to the dependence on closed source software, we do check to see if
hwconfig reports different values in the DEVINFO_HWCONFIG macro.

Matt was seeing this warning on 8086:a7a0:

> MESA: warning: INTEL_HWCONFIG_TOTAL_PS_THREADS (128) != devinfo->max_threads_per_psd (64)

Reported-by: Matt Turner <mattst88@gmail.com>
Fixes: 3e4f73b3a0 ("intel/dev: Update hwconfig => max_threads_per_psd for Xe2")
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31077>
(cherry picked from commit c5c349a690)
This commit is contained in:
Jordan Justen 2024-09-07 11:14:49 -07:00 committed by Eric Engestrom
parent 272a53dbaf
commit fd84af2509
2 changed files with 2 additions and 2 deletions

View file

@ -2824,7 +2824,7 @@
"description": "intel/dev: Fix warning for max_threads_per_psd when devinfo->verx10 == 120",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "3e4f73b3a0e0b9420f9614d3e271c49225c6f5d3",
"notes": null

View file

@ -219,7 +219,7 @@ apply_hwconfig_item(struct intel_device_info *devinfo,
break; /* ignore */
case INTEL_HWCONFIG_TOTAL_PS_THREADS: {
unsigned threads = item->val[0];
if (devinfo->verx10 == 125)
if (devinfo->ver == 12)
threads /= 2;
DEVINFO_HWCONFIG(max_threads_per_psd, threads);
break;