Mesa (master): lima: use 0 to poll if BO is busy in lima_bo_wait()

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 9f897a2b4cf2c0e222487470053a69de843f2084
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f897a2b4cf2c0e222487470053a69de843f2084

Author: Vasily Khoruzhick <anarsoul at gmail.com>
Date:   Sat Sep  7 19:30:39 2019 -0700

lima: use 0 to poll if BO is busy in lima_bo_wait()

os_time_get_absolute_timeout(0) returns current time, while kernel
driver expects 0 as value to poll BO status and return immediately.
Fix it by setting abs_timeout to 0 if timeout_ns is 0

Reviewed-by: Qiang Yu <yuq825 at gmail.com>
Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>

---

 src/gallium/drivers/lima/lima_bo.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/lima/lima_bo.c b/src/gallium/drivers/lima/lima_bo.c
index bd1f6cf8c8c..b082d32afd8 100644
--- a/src/gallium/drivers/lima/lima_bo.c
+++ b/src/gallium/drivers/lima/lima_bo.c
@@ -326,7 +326,13 @@ struct lima_bo *lima_bo_import(struct lima_screen *screen,
 
 bool lima_bo_wait(struct lima_bo *bo, uint32_t op, uint64_t timeout_ns)
 {
-   int64_t abs_timeout = os_time_get_absolute_timeout(timeout_ns);
+   int64_t abs_timeout;
+
+   if (timeout_ns == 0)
+      abs_timeout = 0;
+   else
+      abs_timeout = os_time_get_absolute_timeout(timeout_ns);
+
    if (abs_timeout == OS_TIMEOUT_INFINITE)
       abs_timeout = INT64_MAX;