diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2012-04-26 16:03:04 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-03 11:18:22 +0200 |
| commit | 4146b08d767a702682bd28e2a21b062983fd937c (patch) | |
| tree | f84cae49a2ff8a454a662c889801a646dfca72ed | |
| parent | 604dd3ec75b2488dc81cd25dd85fcea23df25a9e (diff) | |
| download | op-kernel-dev-4146b08d767a702682bd28e2a21b062983fd937c.zip op-kernel-dev-4146b08d767a702682bd28e2a21b062983fd937c.tar.gz | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b7a99bf..c19a621 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) |
