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: Check if the GPU hung whilst waiting for the ring to clear
[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 4d00da97905fd68c815cccb9ba3edf90ce6101eb..2e72d3a0740fd9164b736aa4c5fa9a5e6faa12d4 100644
(file)
--- a/
drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/
drivers/gpu/drm/i915/intel_ringbuffer.c
@@
-711,6
+711,8
@@
int intel_wait_ring_buffer(struct intel_ring_buffer *ring, int n)
}
msleep(1);
+ if (atomic_read(&dev_priv->mm.wedged))
+ return -EAGAIN;
} while (!time_after(jiffies, end));
trace_i915_ring_wait_end (dev);
return -EBUSY;
This page took
0.025397 seconds
and
5
git commands to generate.