From 63ff2a51d3e31c4abd8d3175f0ae744a2a886c8f Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Wed, 30 Oct 2019 21:58:42 +0100 Subject: radv: Fix timeout handling in syncobj wait. libdrm returns -errno instead of directly the ioctl ret of -1. Fixes: 1c3cda7d277 "radv: Add syncobj signal/reset/wait to winsys." Reviewed-by: Samuel Pitoiset (cherry picked from commit ec770085c270cb167c02f299f6985744682933b1) --- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 0c521917027..676dd062ff3 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -1582,7 +1582,7 @@ static bool radv_amdgpu_wait_syncobj(struct radeon_winsys *_ws, const uint32_t * &tmp); if (ret == 0) { return true; - } else if (ret == -1 && errno == ETIME) { + } else if (ret == -ETIME) { return false; } else { fprintf(stderr, "amdgpu: radv_amdgpu_wait_syncobj failed!\nerrno: %d\n", errno); -- cgit v1.2.3