From: Ben Widawsky <ben@bwidawsk.net>
Date: Thu, 26 Apr 2012 23:03:04 +0000 (-0700)
Subject: drm/i915: remove polled wait from throttle
X-Git-Tag: firefly_0821_release~3680^2~2761^2~8^2~41
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4146b08d767a702682bd28e2a21b062983fd937c;p=firefly-linux-kernel-4.4.55.git

drm/i915: remove polled wait from throttle

It's about to go away anyway. Just here to help bisection.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index b7a99bfa423d..c19a6214daf7 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2996,11 +2996,8 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)
 
 			if (ret == 0 && atomic_read(&dev_priv->mm.wedged))
 				ret = -EIO;
-		} else if (wait_for_atomic(i915_seqno_passed(ring->get_seqno(ring),
-							     seqno) ||
-				    atomic_read(&dev_priv->mm.wedged), 3000)) {
+		} else
 			ret = -EBUSY;
-		}
 	}
 
 	if (ret == 0)