From 04494efa7ca3e364f1d3ca54555a20605d54fe05 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Mon, 7 Jul 2025 10:26:50 -0700 Subject: [PATCH] venus: fix a prime blit assert...again The assert doesn't consider multiple queue family case where the same blit cmd has to be recorded for each, thus hitting the assert for the same image and buffer. The prior fix of the same 054c8e117e4d6d9ddb81281ca88586ff53105ee7 was accidentally missed in the reland of the implicit in-fence handling MR: - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39401 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14843 Fixes: eb709cba477 ("venus: track prime blit dst buffer memory in the wsi image") Part-of: --- src/virtio/vulkan/vn_command_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/virtio/vulkan/vn_command_buffer.c b/src/virtio/vulkan/vn_command_buffer.c index 6d31a104c98..433079daa53 100644 --- a/src/virtio/vulkan/vn_command_buffer.c +++ b/src/virtio/vulkan/vn_command_buffer.c @@ -1488,7 +1488,7 @@ vn_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer, */ if (buf->wsi.mem) { assert(img->wsi.is_prime_blit_src); - assert(!img->wsi.blit_mem); + assert(!img->wsi.blit_mem || img->wsi.blit_mem == buf->wsi.mem); img->wsi.blit_mem = buf->wsi.mem; }