diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index d6b06aa4c05c..9438bcd50678 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -1371,7 +1371,8 @@ static int ring_wait_for_space(struct intel_ring_buffer *ring, int n) | |||
1371 | 1371 | ||
1372 | msleep(1); | 1372 | msleep(1); |
1373 | 1373 | ||
1374 | ret = i915_gem_check_wedge(dev_priv, dev_priv->mm.interruptible); | 1374 | ret = i915_gem_check_wedge(&dev_priv->gpu_error, |
1375 | dev_priv->mm.interruptible); | ||
1375 | if (ret) | 1376 | if (ret) |
1376 | return ret; | 1377 | return ret; |
1377 | } while (!time_after(jiffies, end)); | 1378 | } while (!time_after(jiffies, end)); |
@@ -1460,7 +1461,8 @@ int intel_ring_begin(struct intel_ring_buffer *ring, | |||
1460 | drm_i915_private_t *dev_priv = ring->dev->dev_private; | 1461 | drm_i915_private_t *dev_priv = ring->dev->dev_private; |
1461 | int ret; | 1462 | int ret; |
1462 | 1463 | ||
1463 | ret = i915_gem_check_wedge(dev_priv, dev_priv->mm.interruptible); | 1464 | ret = i915_gem_check_wedge(&dev_priv->gpu_error, |
1465 | dev_priv->mm.interruptible); | ||
1464 | if (ret) | 1466 | if (ret) |
1465 | return ret; | 1467 | return ret; |
1466 | 1468 | ||