projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/i915: move wedged to the other gpu error handling stuff
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_ringbuffer.c
diff --git
a/drivers/gpu/drm/i915/intel_ringbuffer.c
b/drivers/gpu/drm/i915/intel_ringbuffer.c
index d6b06aa4c05c0d6dfe7a5cbfaed6d2fb55fd5453..9438bcd506786c04963bce03b8ea86002275d244 100644
(file)
--- 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)
msleep(1);
msleep(1);
- ret = i915_gem_check_wedge(dev_priv, dev_priv->mm.interruptible);
+ ret = i915_gem_check_wedge(&dev_priv->gpu_error,
+ dev_priv->mm.interruptible);
if (ret)
return ret;
} while (!time_after(jiffies, end));
if (ret)
return ret;
} while (!time_after(jiffies, end));
@@
-1460,7
+1461,8
@@
int intel_ring_begin(struct intel_ring_buffer *ring,
drm_i915_private_t *dev_priv = ring->dev->dev_private;
int ret;
drm_i915_private_t *dev_priv = ring->dev->dev_private;
int ret;
- ret = i915_gem_check_wedge(dev_priv, dev_priv->mm.interruptible);
+ ret = i915_gem_check_wedge(&dev_priv->gpu_error,
+ dev_priv->mm.interruptible);
if (ret)
return ret;
if (ret)
return ret;
This page took
0.02529 seconds
and
5
git commands to generate.