fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/dev: Allow specifying a version when to always use hwconfig

Browse source 
Backport-to: 24.2
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31692>
(cherry picked from commit 7b86da0ccd)
This commit is contained in:
Jordan Justen 2024-10-22 15:36:13 -07:00 • committed by Eric Engestrom
parent f878028d18
commit 3da8b46eba
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1414,7 +1414,7 @@
"description": "intel/dev: Allow specifying a version when to always use hwconfig", "description": "intel/dev: Allow specifying a version when to always use hwconfig",
"nominated": true, "nominated": true,
"nomination_type": 4, "nomination_type": 4,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": null, "because_sha": null,
"notes": null "notes": null

37
src/intel/dev/intel_hwconfig.c
View file

@ -155,12 +155,14 @@ apply_hwconfig(const struct intel_device_info *devinfo)
} }
static inline bool static inline bool
should_apply_hwconfig_item(const struct intel_device_info *devinfo, should_apply_hwconfig_item(uint16_t always_apply_verx10,
const struct intel_device_info *devinfo,
const char *devinfo_name, uint32_t devinfo_val, const char *devinfo_name, uint32_t devinfo_val,
const uint32_t hwconfig_key, uint32_t hwconfig_val) const uint32_t hwconfig_key, uint32_t hwconfig_val)
{ {
if (apply_hwconfig(devinfo)) if (apply_hwconfig(devinfo) &&
return true; (devinfo->verx10 >= always_apply_verx10 || devinfo_val == 0))
return true;
#ifndef NDEBUG #ifndef NDEBUG
if (devinfo_val != hwconfig_val) { if (devinfo_val != hwconfig_val) {
@ -180,15 +182,20 @@ should_apply_hwconfig_item(const struct intel_device_info *devinfo,
* hwconfig value, ``V``, with the current value in ``F`` and log a warning * hwconfig value, ``V``, with the current value in ``F`` and log a warning
* message if they differ. This should help to make sure the values in our * message if they differ. This should help to make sure the values in our
* devinfo structures match what hwconfig is specified. * devinfo structures match what hwconfig is specified.
*
* If ``devinfo->verx10 >= CVER``, then the hwconfig value is always be used.
* If ``devinfo->verx10 < CVER``, the hwconfig value is only used if
* devinfo->F is 0.
*/ */
#define DEVINFO_HWCONFIG_KV(F, K, V) \ #define DEVINFO_HWCONFIG_KV(CVER, F, K, V) \
do { \ do { \
if (should_apply_hwconfig_item(devinfo, #F, devinfo->F, (K), \ if (should_apply_hwconfig_item((CVER), devinfo, #F, devinfo->F, \
(V))) \ (K), (V))) \
devinfo->F = (V); \ devinfo->F = (V); \
} while (0) } while (0)
#define DEVINFO_HWCONFIG(F, I) DEVINFO_HWCONFIG_KV(F, (I)->key, (I)->val[0]) #define DEVINFO_HWCONFIG(CVER, F, I) \
DEVINFO_HWCONFIG_KV((CVER), F, (I)->key, (I)->val[0])
static void static void
apply_hwconfig_item(struct intel_device_info *devinfo, apply_hwconfig_item(struct intel_device_info *devinfo,
@ -210,22 +217,22 @@ apply_hwconfig_item(struct intel_device_info *devinfo,
case INTEL_HWCONFIG_DEPRECATED_SLM_SIZE_IN_KB: case INTEL_HWCONFIG_DEPRECATED_SLM_SIZE_IN_KB:
break; /* ignore */ break; /* ignore */
case INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS: case INTEL_HWCONFIG_MAX_NUM_EU_PER_DSS:
DEVINFO_HWCONFIG(max_eus_per_subslice, item); DEVINFO_HWCONFIG(125, max_eus_per_subslice, item);
break; break;
case INTEL_HWCONFIG_NUM_THREADS_PER_EU: case INTEL_HWCONFIG_NUM_THREADS_PER_EU:
DEVINFO_HWCONFIG(num_thread_per_eu, item); DEVINFO_HWCONFIG(125, num_thread_per_eu, item);
break; break;
case INTEL_HWCONFIG_TOTAL_VS_THREADS: case INTEL_HWCONFIG_TOTAL_VS_THREADS:
DEVINFO_HWCONFIG(max_vs_threads, item); DEVINFO_HWCONFIG(125, max_vs_threads, item);
break; break;
case INTEL_HWCONFIG_TOTAL_GS_THREADS: case INTEL_HWCONFIG_TOTAL_GS_THREADS:
DEVINFO_HWCONFIG(max_gs_threads, item); DEVINFO_HWCONFIG(125, max_gs_threads, item);
break; break;
case INTEL_HWCONFIG_TOTAL_HS_THREADS: case INTEL_HWCONFIG_TOTAL_HS_THREADS:
DEVINFO_HWCONFIG(max_tcs_threads, item); DEVINFO_HWCONFIG(125, max_tcs_threads, item);
break; break;
case INTEL_HWCONFIG_TOTAL_DS_THREADS: case INTEL_HWCONFIG_TOTAL_DS_THREADS:
DEVINFO_HWCONFIG(max_tes_threads, item); DEVINFO_HWCONFIG(125, max_tes_threads, item);
break; break;
case INTEL_HWCONFIG_TOTAL_VS_THREADS_POCS: case INTEL_HWCONFIG_TOTAL_VS_THREADS_POCS:
break; /* ignore */ break; /* ignore */
@ -233,11 +240,11 @@ apply_hwconfig_item(struct intel_device_info *devinfo,
unsigned threads = item->val[0]; unsigned threads = item->val[0];
if (devinfo->ver == 12) if (devinfo->ver == 12)
threads /= 2; threads /= 2;
DEVINFO_HWCONFIG_KV(max_threads_per_psd, item->key, threads); DEVINFO_HWCONFIG_KV(125, max_threads_per_psd, item->key, threads);
break; break;
} }
case INTEL_HWCONFIG_URB_SIZE_PER_SLICE_IN_KB: case INTEL_HWCONFIG_URB_SIZE_PER_SLICE_IN_KB:
DEVINFO_HWCONFIG(urb.size, item); DEVINFO_HWCONFIG(125, urb.size, item);
break; break;
case INTEL_HWCONFIG_DEPRECATED_MAX_FILL_RATE: case INTEL_HWCONFIG_DEPRECATED_MAX_FILL_RATE:
case INTEL_HWCONFIG_MAX_RCS: case INTEL_HWCONFIG_MAX_RCS: