For the series. Reviewed-by: Dave Airlie <airl...@redhat.com>
On 27 February 2018 at 09:37, Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl> wrote: > 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" > --- > 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 f197b7f484..ca99ba50ba 100644 > --- a/src/amd/vulkan/radv_device.c > +++ b/src/amd/vulkan/radv_device.c > @@ -2908,13 +2908,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); > > @@ -2932,7 +2936,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.16.1 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev