From 63676ed5023b45fa2e6a79debb047af69d2cd75f Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 15 Feb 2024 17:57:55 +0200 Subject: [PATCH] anv: fix Wa_16013994831 macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit that switched to the WA framework forgot to update one of the ifdef section. Signed-off-by: Lionel Landwerlin Fixes: e6e320fc79 ("anv: make Wa_16013994831 to use intel_needs_workaround") Reviewed-by: Tapani Pälli Part-of: --- src/intel/vulkan/genX_gfx_state.c | 2 +- src/intel/vulkan/genX_gpu_memcpy.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/intel/vulkan/genX_gfx_state.c b/src/intel/vulkan/genX_gfx_state.c index db853db4b39..d190f1e57c0 100644 --- a/src/intel/vulkan/genX_gfx_state.c +++ b/src/intel/vulkan/genX_gfx_state.c @@ -68,7 +68,7 @@ static const uint32_t genX(vk_to_intel_blend_op)[] = { static void genX(streamout_prologue)(struct anv_cmd_buffer *cmd_buffer) { -#if GFX_VERx10 >= 120 +#if INTEL_WA_16013994831_GFX_VER /* Wa_16013994831 - Disable preemption during streamout, enable back * again if XFB not used by the current pipeline. * diff --git a/src/intel/vulkan/genX_gpu_memcpy.c b/src/intel/vulkan/genX_gpu_memcpy.c index 21699dc1954..60ca6f0a248 100644 --- a/src/intel/vulkan/genX_gpu_memcpy.c +++ b/src/intel/vulkan/genX_gpu_memcpy.c @@ -82,7 +82,9 @@ emit_common_so_memcpy(struct anv_batch *batch, struct anv_device *device, anv_batch_emit(batch, GENX(3DSTATE_MESH_CONTROL), mesh); anv_batch_emit(batch, GENX(3DSTATE_TASK_CONTROL), task); } +#endif +#if INTEL_WA_16013994831_GFX_VER /* Wa_16013994831 - Disable preemption during streamout. */ if (intel_needs_workaround(device->info, 16013994831)) genX(batch_set_preemption)(batch, device->info, _3D, false);