1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c
index 72b7f7d9461d..f31deeb72703 100644
--- a/drivers/gpu/drm/i915/i915_gem_request.c
+++ b/drivers/gpu/drm/i915/i915_gem_request.c
@@ -1025,8 +1025,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)