From fd84af2509aeaacc7e0edc6acc8b2bcee67c2333 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sat, 7 Sep 2024 11:14:49 -0700 Subject: [PATCH] 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 Fixes: 3e4f73b3a0e ("intel/dev: Update hwconfig => max_threads_per_psd for Xe2") Signed-off-by: Jordan Justen Reviewed-by: Kenneth Graunke Part-of: (cherry picked from commit c5c349a690288c8f3a4caa888bea37cbb851d2f0) --- .pick_status.json | 2 +- src/intel/dev/intel_hwconfig.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0f9f711db35..f8cfbcb371d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 diff --git a/src/intel/dev/intel_hwconfig.c b/src/intel/dev/intel_hwconfig.c index 7ec8ac387eb..55b636e3cc4 100644 --- a/src/intel/dev/intel_hwconfig.c +++ b/src/intel/dev/intel_hwconfig.c @@ -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;