|
@@ -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))
|
|
if (ret == 0 && atomic_read(&dev_priv->mm.wedged))
|
|
ret = -EIO;
|
|
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;
|
|
ret = -EBUSY;
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
if (ret == 0)
|
|
if (ret == 0)
|