From 2a404c6f923880cfd0bc04f9db1890cadce8bd92 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 26 Feb 2018 22:50:41 +0100 Subject: [PATCH] radv: Implement WaitForFences with !waitAll. Nothing to do except using a busy wait loop. At least for old kernels. A better implementation for newer kernels to come later. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105255 Fixes: f4e499ec79 "radv: add initial non-conformant radv vulkan driver" Reviewed-by: Dave Airlie --- src/amd/vulkan/radv_device.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 92865122ad5..24ea3b689ec 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -2890,13 +2890,17 @@ void radv_DestroyFence( vk_free2(&device->alloc, pAllocator, fence); } -static uint64_t radv_get_absolute_timeout(uint64_t timeout) + +static uint64_t radv_get_current_time() { - uint64_t current_time; struct timespec tv; - clock_gettime(CLOCK_MONOTONIC, &tv); - current_time = tv.tv_nsec + tv.tv_sec*1000000000ull; + return tv.tv_nsec + tv.tv_sec*1000000000ull; +} + +static uint64_t radv_get_absolute_timeout(uint64_t timeout) +{ + uint64_t current_time = radv_get_current_time(); timeout = MIN2(UINT64_MAX - current_time, timeout); @@ -2914,7 +2918,13 @@ VkResult radv_WaitForFences( timeout = radv_get_absolute_timeout(timeout); if (!waitAll && fenceCount > 1) { - fprintf(stderr, "radv: WaitForFences without waitAll not implemented yet\n"); + while(radv_get_current_time() <= timeout) { + for (uint32_t i = 0; i < fenceCount; ++i) { + if (radv_GetFenceStatus(_device, pFences[i]) == VK_SUCCESS) + return VK_SUCCESS; + } + } + return VK_TIMEOUT; } for (uint32_t i = 0; i < fenceCount; ++i) { -- 2.30.2