drm/i915: remove polled wait from throttle
authorBen Widawsky <ben@bwidawsk.net>
Thu, 26 Apr 2012 23:03:04 +0000 (16:03 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 3 May 2012 09:18:22 +0000 (11:18 +0200)
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>
drivers/gpu/drm/i915/i915_gem.c

index b7a99bfa423d7353d4a60cc3770bab121e76a819..c19a6214daf7da4e3a4aae030ce55c281c30f947 100644 (file)
@@ -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)