From 8eceff48cdb73d48a5db3c393eda60d099709845 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Wed, 15 Mar 2023 13:45:22 -0700 Subject: [PATCH] intel/dev: use GFX_VERx10 to detect genX compilation Depending on the ordering of includes, GFX_VER may not defined for intel_device_info.h. The failure mode of this case is silent: BITSET_TEST will be called when it could be compiled out. GFX_VERx10 should be used in place of GFX_VER. GFX_VERx10 is defined by a compiler flag, and is always present for genX compilation units. Fixes: 3c9a8f7a6d2 ("intel/dev: generate helpers to identify platform workarounds") Reviewed-by: Kenneth Graunke Part-of: --- src/intel/dev/intel_device_info.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/dev/intel_device_info.h b/src/intel/dev/intel_device_info.h index 865416e..bf7be9a 100644 --- a/src/intel/dev/intel_device_info.h +++ b/src/intel/dev/intel_device_info.h @@ -575,7 +575,7 @@ void intel_device_info_update_cs_workgroup_threads(struct intel_device_info *dev bool intel_device_info_compute_system_memory(struct intel_device_info *devinfo, bool update); void intel_device_info_update_after_hwconfig(struct intel_device_info *devinfo); -#ifdef GFX_VER +#ifdef GFX_VERx10 #define intel_needs_workaround(devinfo, id) \ INTEL_WA_ ## id ## _GFX_VER && \ BITSET_TEST(devinfo->workarounds, INTEL_WA_##id) -- 2.7.4