intel/fs/bank_conflicts: Don't touch Gen7 MRF hack registers.

[mesa.git] / src / util / u_queue.h

diff --git a/src/util/u_queue.h b/src/util/u_queue.h
index ec028157480a7e614c419eae7a5059b5e6586fe7..d49f713e6ad3b49ad1e458170c275c13393bdab0 100644 (file)
--- a/src/util/u_queue.h
+++ b/src/util/u_queue.h
@@ -38,6 +38,7 @@
 #include "util/futex.h"
 #include "util/list.h"
 #include "util/macros.h"
+#include "util/os_time.h"
 #include "util/u_atomic.h"
 #include "util/u_thread.h"
 
@@ -48,7 +49,7 @@ extern "C" {
 #define UTIL_QUEUE_INIT_USE_MINIMUM_PRIORITY      (1 << 0)
 #define UTIL_QUEUE_INIT_RESIZE_IF_FULL            (1 << 1)
 
-#if defined(__GNUC__) && defined(HAVE_FUTEX)
+#if defined(__GNUC__) && defined(HAVE_LINUX_FUTEX_H)
 #define UTIL_QUEUE_FENCE_FUTEX
 #else
 #define UTIL_QUEUE_FENCE_STANDARD
@@ -179,6 +180,11 @@ util_queue_fence_wait_timeout(struct util_queue_fence *fence,
    if (util_queue_fence_is_signalled(fence))
       return true;
 
+   if (abs_timeout == (int64_t)OS_TIMEOUT_INFINITE) {
+      _util_queue_fence_wait(fence);
+      return true;
+   }
+
    return _util_queue_fence_wait_timeout(fence, abs_timeout);
 }