diff --git a/.pick_status.json b/.pick_status.json index d64b3800518..9b66c37905d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -684,7 +684,7 @@ "description": "anv: if queue is NULL in vm_bind return early", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "dd5362c78a1d2e8bb88cd321f510e5f9660775e1", "notes": null diff --git a/src/intel/vulkan/anv_sparse.c b/src/intel/vulkan/anv_sparse.c index e489c12be49..827d1fe2e0e 100644 --- a/src/intel/vulkan/anv_sparse.c +++ b/src/intel/vulkan/anv_sparse.c @@ -741,11 +741,13 @@ anv_sparse_bind_vm_bind(struct anv_device *device, { struct anv_queue *queue = submit->queue; - if (!queue) - assert(submit->wait_count == 0 && submit->signal_count == 0); - VkResult result = device->kmd_backend->vm_bind(device, submit, ANV_VM_BIND_FLAG_NONE); + if (!queue) { + assert(submit->wait_count == 0 && submit->signal_count == 0 && + submit->binds_len == 1); + return result; + } if (result == VK_ERROR_OUT_OF_HOST_MEMORY) { /* If we get this, the system is under memory pressure. First we