From 8dd90997d7285f2e97ff266fe8c4b81370cc90d4 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: (cherry picked from commit 63676ed5023b45fa2e6a79debb047af69d2cd75f) --- .pick_status.json | 2 +- src/intel/vulkan/genX_gfx_state.c | 2 +- src/intel/vulkan/genX_gpu_memcpy.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e84f6469c18..37108f61c24 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2674,7 +2674,7 @@ "description": "anv: fix Wa_16013994831 macros", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e6e320fc7996db60231d277bc3e28fdd01018b33", "notes": null diff --git a/src/intel/vulkan/genX_gfx_state.c b/src/intel/vulkan/genX_gfx_state.c index 66af91f8f62..ab6b87e4983 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 70b0851850f..92ed6f13ac2 100644 --- a/src/intel/vulkan/genX_gpu_memcpy.c +++ b/src/intel/vulkan/genX_gpu_memcpy.c @@ -80,7 +80,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);