From a88c9ea192c3588b99f8d35a292d84d12779d100 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 17 Feb 2025 21:01:00 +0200 Subject: [PATCH] anv: limit implict write with drirc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 9f32e1a489 meant to amend 1e80a426c2. Signed-off-by: Lionel Landwerlin Fixes: 9f32e1a489 ("anv/drirc: Add option to control implicit sync on external BOs") Reviewed-by: José Roberto de Souza Reviewed-by: Matt Turner Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12629 Part-of: --- src/intel/vulkan/anv_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 4f4abf70187..0fb86e9d846 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -1562,8 +1562,7 @@ VkResult anv_AllocateMemory( alloc_flags |= ANV_BO_ALLOC_EXTERNAL; /* wsi has its own way of synchronizing with the compositor */ - if (pdevice->instance->external_memory_implicit_sync && - !wsi_info && dedicated_info && + if (!wsi_info && dedicated_info && dedicated_info->image != VK_NULL_HANDLE) { ANV_FROM_HANDLE(anv_image, image, dedicated_info->image); @@ -1578,7 +1577,8 @@ VkResult anv_AllocateMemory( * consumer side relying on implicit fencing can have a fence to * wait for render complete. */ - if (image->vk.usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) + if (pdevice->instance->external_memory_implicit_sync && + (image->vk.usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT)) alloc_flags |= ANV_BO_ALLOC_IMPLICIT_WRITE; } }