Module: Mesa Branch: staging/21.3 Commit: 53250e8e478e057135d5a8ed2d6a4d61504fc339 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=53250e8e478e057135d5a8ed2d6a4d61504fc339
Author: Jesse Natalie <[email protected]> Date: Sat Aug 7 19:27:41 2021 -0700 d3d12: Fix Linux fence wait return value zero is for success, nonzero is failure. Fixes: 0b60d6a2 ("d3d12: Support Linux eventfds for fences") Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12268> (cherry picked from commit accd8326c5cb78788f12e3066bb6654595c23a51) --- .pick_status.json | 2 +- src/gallium/drivers/d3d12/d3d12_fence.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 80e6feed020..25a848011c6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -265,7 +265,7 @@ "description": "d3d12: Fix Linux fence wait return value", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0b60d6a24d405066c4077154095a76204c103cc1" }, diff --git a/src/gallium/drivers/d3d12/d3d12_fence.cpp b/src/gallium/drivers/d3d12/d3d12_fence.cpp index 453c72b55e8..72e2567a5f9 100644 --- a/src/gallium/drivers/d3d12/d3d12_fence.cpp +++ b/src/gallium/drivers/d3d12/d3d12_fence.cpp @@ -72,7 +72,7 @@ static bool wait_event(HANDLE event, int event_fd, uint64_t timeout_ns) { int timeout_ms = (timeout_ns == PIPE_TIMEOUT_INFINITE) ? -1 : timeout_ns / 1000000; - return sync_wait(event_fd, timeout_ms); + return sync_wait(event_fd, timeout_ms) == 0; } #endif
