diff options
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 66e0a555dbcc..e55badb2d86d 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -2006,9 +2006,9 @@ i915_wait_request(struct intel_ring_buffer *ring, | |||
| 2006 | || atomic_read(&dev_priv->mm.wedged)); | 2006 | || atomic_read(&dev_priv->mm.wedged)); |
| 2007 | 2007 | ||
| 2008 | ring->irq_put(ring); | 2008 | ring->irq_put(ring); |
| 2009 | } else if (wait_for(i915_seqno_passed(ring->get_seqno(ring), | 2009 | } else if (wait_for_atomic(i915_seqno_passed(ring->get_seqno(ring), |
| 2010 | seqno) || | 2010 | seqno) || |
| 2011 | atomic_read(&dev_priv->mm.wedged), 3000)) | 2011 | atomic_read(&dev_priv->mm.wedged), 3000)) |
| 2012 | ret = -EBUSY; | 2012 | ret = -EBUSY; |
| 2013 | ring->waiting_seqno = 0; | 2013 | ring->waiting_seqno = 0; |
| 2014 | 2014 | ||
| @@ -3309,8 +3309,8 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file) | |||
| 3309 | 3309 | ||
| 3310 | if (ret == 0 && atomic_read(&dev_priv->mm.wedged)) | 3310 | if (ret == 0 && atomic_read(&dev_priv->mm.wedged)) |
| 3311 | ret = -EIO; | 3311 | ret = -EIO; |
| 3312 | } else if (wait_for(i915_seqno_passed(ring->get_seqno(ring), | 3312 | } else if (wait_for_atomic(i915_seqno_passed(ring->get_seqno(ring), |
| 3313 | seqno) || | 3313 | seqno) || |
| 3314 | atomic_read(&dev_priv->mm.wedged), 3000)) { | 3314 | atomic_read(&dev_priv->mm.wedged), 3000)) { |
| 3315 | ret = -EBUSY; | 3315 | ret = -EBUSY; |
| 3316 | } | 3316 | } |