aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-02-22 15:39:12 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-02-27 12:08:22 -0500
commiteadb29a9c52eb14a84b94fc29bb1cfa93ddc653e (patch)
tree02cf9cd6a926e09ce465171e4e4449ab50510cab /drivers
parentc3e5f67b390f2d915e66433f8ba7b5a99a1d3d8a (diff)
drm/i915: Silence the error message from i915_wait_request()
This error message has since been superseded by the hangcheck, and does not add any salient information beyond that already printed by hangcheck discovering the GPU hang that lead to i915_wait_request() bombing out in the first place. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 19a06c280b12..6dbcec387951 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1985,11 +1985,6 @@ i915_wait_request(struct intel_ring_buffer *ring,
1985 if (atomic_read(&dev_priv->mm.wedged)) 1985 if (atomic_read(&dev_priv->mm.wedged))
1986 ret = -EAGAIN; 1986 ret = -EAGAIN;
1987 1987
1988 if (ret && ret != -ERESTARTSYS)
1989 DRM_ERROR("%s returns %d (awaiting %d at %d, next %d)\n",
1990 __func__, ret, seqno, ring->get_seqno(ring),
1991 dev_priv->next_seqno);
1992
1993 /* Directly dispatch request retiring. While we have the work queue 1988 /* Directly dispatch request retiring. While we have the work queue
1994 * to handle this, the waiter on a request often wants an associated 1989 * to handle this, the waiter on a request often wants an associated
1995 * buffer to have made it to the inactive list, and we would need 1990 * buffer to have made it to the inactive list, and we would need