From 8acf6584b533e5ec4d0fb24098d37f4e7cdd254d Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 22 Feb 2012 20:39:12 +0000 Subject: [PATCH] --- yaml --- r: 293826 b: refs/heads/master c: eadb29a9c52eb14a84b94fc29bb1cfa93ddc653e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b5ca04c7830a..9d51df4d66be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3e5f67b390f2d915e66433f8ba7b5a99a1d3d8a +refs/heads/master: eadb29a9c52eb14a84b94fc29bb1cfa93ddc653e diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 19a06c280b12..6dbcec387951 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -1985,11 +1985,6 @@ i915_wait_request(struct intel_ring_buffer *ring, if (atomic_read(&dev_priv->mm.wedged)) ret = -EAGAIN; - if (ret && ret != -ERESTARTSYS) - DRM_ERROR("%s returns %d (awaiting %d at %d, next %d)\n", - __func__, ret, seqno, ring->get_seqno(ring), - dev_priv->next_seqno); - /* Directly dispatch request retiring. While we have the work queue * to handle this, the waiter on a request often wants an associated * buffer to have made it to the inactive list, and we would need