From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Mon, 13 Nov 2017 13:50:17 +0000 (+0100)
Subject: radeonsi: recompute the relative timeout after waiting for ready fence
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3db1ce01b1f33aaeceda4038487a4ce0ceb77267;p=mesa.git

radeonsi: recompute the relative timeout after waiting for ready fence

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_fence.c b/src/gallium/drivers/radeonsi/si_fence.c
index fa80f4fd87a..ff1800ce785 100644
--- a/src/gallium/drivers/radeonsi/si_fence.c
+++ b/src/gallium/drivers/radeonsi/si_fence.c
@@ -216,6 +216,11 @@ static boolean si_fence_finish(struct pipe_screen *screen,
 			if (!util_queue_fence_wait_timeout(&rfence->ready, abs_timeout))
 				return false;
 		}
+
+		if (timeout && timeout != PIPE_TIMEOUT_INFINITE) {
+			int64_t time = os_time_get_nano();
+			timeout = abs_timeout > time ? abs_timeout - time : 0;
+		}
 	}
 
 	if (rfence->sdma) {