From: Chia-I Wu <olvaffe@gmail.com>
Date: Wed, 5 Nov 2014 07:27:42 +0000 (+0800)
Subject: ilo: fix intel_bo_wait() on kernel 3.17
X-Git-Tag: upstream/17.1.0~22593
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29253f44d00663c377a6b4f45511123a92abfd6a;p=platform%2Fupstream%2Fmesa.git

ilo: fix intel_bo_wait() on kernel 3.17

drm_intel_gem_bo_wait() with negative timeout is broken on kernel 3.17.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
---

diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c
index 7b542dc..9b94ac6 100644
--- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c
+++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c
@@ -610,7 +610,13 @@ intel_bo_wait(struct intel_bo *bo, int64_t timeout)
 {
    int err;
 
-   err = drm_intel_gem_bo_wait(gem_bo(bo), timeout);
+   if (timeout >= 0) {
+      err = drm_intel_gem_bo_wait(gem_bo(bo), timeout);
+   } else {
+      drm_intel_bo_wait_rendering(gem_bo(bo));
+      err = 0;
+   }
+
    /* consider the bo idle on errors */
    if (err && err != -ETIME)
       err = 0;