projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d3373a2
)
drm/i915: Add -EIO to the list of known errors for __wait_seqno
author
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 16 Jul 2012 12:05:34 +0000
(13:05 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 25 Jul 2012 08:39:57 +0000
(10:39 +0200)
This prevents a WARN introduced with
commit
de2b998552c1534e87bfbc51ec5734b02bc89020
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Jul 4 22:52:50 2012 +0200
drm/i915: don't return a spurious -EIO from intel_ring_begin
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gem.c
b/drivers/gpu/drm/i915/i915_gem.c
index 89d62f635ac80fa192126584b6e66ba369d8b4e1..5c4657a54f977689c1668a9a70b8a8f6e39743c9 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem.c
+++ b/
drivers/gpu/drm/i915/i915_gem.c
@@
-2003,6
+2003,7
@@
static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
}
switch (end) {
+ case -EIO:
case -EAGAIN: /* Wedged */
case -ERESTARTSYS: /* Signal */
return (int)end;