From 3cd972a2d35cc3f00c32e6434b799ccfa9f6f5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Thu, 1 May 2025 08:40:38 -0700 Subject: [PATCH] anv: Enable preemption due 3DPRIMITIVE in GFX 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The issues preventing it to be enabled were fixed so now we can enable it but we need also to enable workaround 16013994831 back again. Cc: mesa-stable Reviewed-by: Lionel Landwerlin Signed-off-by: José Roberto de Souza Part-of: --- src/intel/vulkan/anv_physical_device.c | 8 -------- src/intel/vulkan/genX_init_state.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/src/intel/vulkan/anv_physical_device.c b/src/intel/vulkan/anv_physical_device.c index 6f766eda9db..1be29556042 100644 --- a/src/intel/vulkan/anv_physical_device.c +++ b/src/intel/vulkan/anv_physical_device.c @@ -2552,14 +2552,6 @@ anv_physical_device_try_create(struct vk_instance *vk_instance, goto fail_fd; } - /* Disable Wa_16013994831 on Gfx12.0 because we found other cases where we - * need to always disable preemption : - * - https://gitlab.freedesktop.org/mesa/mesa/-/issues/5963 - * - https://gitlab.freedesktop.org/mesa/mesa/-/issues/5662 - */ - if (devinfo.verx10 == 120) - BITSET_CLEAR(devinfo.workarounds, INTEL_WA_16013994831); - if (!devinfo.has_context_isolation) { result = vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER, "Vulkan requires context isolation for %s", devinfo.name); diff --git a/src/intel/vulkan/genX_init_state.c b/src/intel/vulkan/genX_init_state.c index b8df464dd01..ea935c9f8c9 100644 --- a/src/intel/vulkan/genX_init_state.c +++ b/src/intel/vulkan/genX_init_state.c @@ -506,11 +506,6 @@ init_render_queue_state(struct anv_queue *queue, bool is_companion_rcs_batch) anv_batch_write_reg(batch, GENX(CS_CHICKEN1), cc1) { cc1.ReplayMode = MidcmdbufferPreemption; cc1.ReplayModeMask = true; - -#if GFX_VERx10 == 120 - cc1.DisablePreemptionandHighPriorityPausingdueto3DPRIMITIVECommand = true; - cc1.DisablePreemptionandHighPriorityPausingdueto3DPRIMITIVECommandMask = true; -#endif } #if INTEL_NEEDS_WA_1806527549