drm/i915: Check for timeout completion when waiting for the rq to submitted

[mirror_ubuntu-zesty-kernel.git] / drivers / gpu / drm / i915 / i915_gem_request.c

diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c
index b8f403faadbb867af596e1f3d967e1d411ed443e..d7958dc26d21098c4996cb4cee3cbfc755e0e5ed 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_request.c
+++ b/drivers/gpu/drm/i915/i915_gem_request.c
@@ -1011,8 +1011,13 @@ __i915_request_wait_for_execute(struct drm_i915_gem_request *request,
                        break;
                }
 
+               if (!timeout) {
+                       timeout = -ETIME;
+                       break;
+               }
+
                timeout = io_schedule_timeout(timeout);
-       } while (timeout);
+       } while (1);
        finish_wait(&request->execute.wait, &wait);
 
        if (flags & I915_WAIT_LOCKED)