fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 21:20:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

anv: Check for device loss at the end of WaitForFences

Browse source 
It's possible that the device could have been lost while we were
waiting.  We should let the user know if this has happened.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand 2017-03-27 16:01:42 -07:00
parent c6f69eea6a
commit 82573d0f75
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1857,6 +1857,7 @@ VkResult anv_WaitForFences(
*/
int64_t timeout = MIN2(_timeout, INT64_MAX);
VkResult result = VK_SUCCESS;
uint32_t pending_fences = fenceCount;
while (pending_fences) {
pending_fences = 0;
@ -1877,8 +1878,10 @@ VkResult anv_WaitForFences(
/* This fence is not pending. If waitAll isn't set, we can return
* early. Otherwise, we have to keep going.
*/
if (!waitAll)
return VK_SUCCESS;
if (!waitAll) {
result = VK_SUCCESS;
goto done;
}
continue;
case ANV_FENCE_STATE_SUBMITTED:
@ -1887,7 +1890,8 @@ VkResult anv_WaitForFences(
*/
ret = anv_gem_wait(device, fence->bo.gem_handle, &timeout);
if (ret == -1 && errno == ETIME) {
return VK_TIMEOUT;
result = VK_TIMEOUT;
goto done;
} else if (ret == -1) {
/* We don't know the real error. */
device->lost = true;
@ -1950,7 +1954,8 @@ VkResult anv_WaitForFences(
if (time_elapsed >= timeout) {
pthread_mutex_unlock(&device->mutex);
return VK_TIMEOUT;
result = VK_TIMEOUT;
goto done;
}
timeout -= time_elapsed;
@ -1960,7 +1965,11 @@ VkResult anv_WaitForFences(
}
}
return VK_SUCCESS;
done:
if (unlikely(device->lost))
return VK_ERROR_DEVICE_LOST;
return result;
}
// Queue semaphore functions