intel/dev: fix macro string concatenation for INTEL_WA_{id}_GFX_VER
authorMark Janes <markjanes@swizzler.org>
Tue, 14 Mar 2023 17:19:17 +0000 (10:19 -0700)
committerMarge Bot <emma+marge@anholt.net>
Thu, 23 Mar 2023 23:23:52 +0000 (23:23 +0000)
`INTEL_WA_##id_GFX_VER` evaluates to `INTEL_WA_id_GFX_VER`
instead of numbered identifiers like `INTEL_WA_220579888_GFX_VER`.

Fixes: 3c9a8f7a6d2 ("intel/dev: generate helpers to identify platform workarounds")
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21908>

src/intel/dev/intel_device_info.h

index 6b5f61e..865416e 100644 (file)
@@ -577,7 +577,7 @@ void intel_device_info_update_after_hwconfig(struct intel_device_info *devinfo);
 
 #ifdef GFX_VER
 #define intel_needs_workaround(devinfo, id)         \
-   INTEL_WA_##id_GFX_VER &&                              \
+   INTEL_WA_ ## id ## _GFX_VER &&                              \
    BITSET_TEST(devinfo->workarounds, INTEL_WA_##id)
 #else
 #define intel_needs_workaround(devinfo, id) \