From dced0dba023f3993c47ed5bb37c5544ea420b3a4 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Mon, 27 Nov 2023 10:54:37 +0100 Subject: [PATCH] venus: Do not submit batch manually when no feedback is required This fixes hangs with Zink on piglit spec@arb_sparse_buffer tests caused by the double submission. Fixes: a55d26b566f ("venus: add back sparse binding support") Signed-off-by: Mary Guillemard Part-of: (cherry picked from commit f59665bb62b579c6cc26155a26ce557f9f3357d2) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_queue.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 15f8be3..3d0fa15 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -74,7 +74,7 @@ "description": "venus: Do not submit batch manually when no feedback is required", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a55d26b566f1ba67f770f689e4de9b0f70c0d47b", "notes": null diff --git a/src/virtio/vulkan/vn_queue.c b/src/virtio/vulkan/vn_queue.c index 57c0670..31e2d2d 100644 --- a/src/virtio/vulkan/vn_queue.c +++ b/src/virtio/vulkan/vn_queue.c @@ -1405,9 +1405,7 @@ vn_QueueBindSparse(VkQueue queue, /* if feedback isn't used in the batch, can directly submit */ if (!submit.has_feedback_fence && !submit.has_feedback_semaphore && !submit.has_feedback_query) { - result = vn_queue_bind_sparse_submit(&submit); - if (result != VK_SUCCESS) - return result; + return vn_queue_bind_sparse_submit(&submit); } for (uint32_t i = 0; i < submit.batch_count; i++) { -- 2.7.4