Mesa (staging/19.2): radv: Fix timeout handling in syncobj wait.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Oct 31 16:04:01 UTC 2019
Module: Mesa
Branch: staging/19.2
Commit: 40fde08d466994b3c0eb87ad01fc122aeec2a35c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=40fde08d466994b3c0eb87ad01fc122aeec2a35c
Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date: Wed Oct 30 21:58:42 2019 +0100
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 <samuel.pitoiset at gmail.com>
(cherry picked from commit ec770085c270cb167c02f299f6985744682933b1)
---
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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);
More information about the mesa-commit
mailing list