From db5a9976260e54d46674e7611f8d4bc18061a605 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 20 Feb 2024 15:07:13 +0200 Subject: [PATCH] anv: disable Wa_16013994831 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We've implemented another workaround completely disabling high priority preemption. 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 137b7e874f22a9b4ce37b4cbe2a11576f7648109) --- .pick_status.json | 2 +- src/intel/vulkan/anv_device.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 300b2aced5b..c9f624d2eb4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2004,7 +2004,7 @@ "description": "anv: disable Wa_16013994831", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e6e320fc7996db60231d277bc3e28fdd01018b33", "notes": null diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 56473427dbe..02010295343 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -2165,6 +2165,14 @@ 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);