fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: Flush the queue on DeviceWaitIdle

Browse source 
When we have syncobj_wait, we can trust in WAIT_FOR_SUBMIT but when we
don't, we only have BO waits and those aren't quite as nice.  This
commit adds a flag to _anv_queue_submit to wait for the queue to drain
before returning.  This gives us the behavior we need to implement
DeviceWaitIdle.

Fixes: 246261f0ad "anv: prepare the driver for delayed submissions"
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand 2019-12-10 22:55:58 -06:00
parent 0bafde717d
commit 98a83d0fce
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/intel/vulkan/anv_queue.c
View file

@ -348,7 +348,8 @@ anv_device_submit_deferred_locked(struct anv_device *device)
}
static VkResult
_anv_queue_submit(struct anv_queue *queue, struct anv_queue_submit **_submit)
_anv_queue_submit(struct anv_queue *queue, struct anv_queue_submit **_submit,
bool flush_queue)
{
struct anv_queue_submit *submit = *_submit;
@ -361,6 +362,18 @@ _anv_queue_submit(struct anv_queue *queue, struct anv_queue_submit **_submit)
pthread_mutex_lock(&queue->device->mutex);
list_addtail(&submit->link, &queue->queued_submits);
VkResult result = anv_device_submit_deferred_locked(queue->device);
if (flush_queue) {
while (result == VK_SUCCESS && !list_is_empty(&queue->queued_submits)) {
int ret = pthread_cond_wait(&queue->device->queue_submit,
&queue->device->mutex);
if (ret != 0) {
result = anv_device_set_lost(queue->device, "wait timeout");
break;
}
result = anv_device_submit_deferred_locked(queue->device);
}
}
pthread_mutex_unlock(&queue->device->mutex);
return result;
}
@ -599,7 +612,7 @@ anv_queue_submit_simple_batch(struct anv_queue *queue,
submit->simple_bo_size = size;
}
result = _anv_queue_submit(queue, &submit);
result = _anv_queue_submit(queue, &submit, true);
if (result == VK_SUCCESS) {
if (has_syncobj_wait) {
@ -889,7 +902,7 @@ anv_queue_submit(struct anv_queue *queue,
}
}
result = _anv_queue_submit(queue, &submit);
result = _anv_queue_submit(queue, &submit, false);
if (result != VK_SUCCESS)
goto error;