From: Chris Wilson Date: Wed, 12 Jan 2011 20:33:01 +0000 (+0000) Subject: drm/i915: Fix error handler to capture the first batch after the seqno X-Git-Tag: v2.6.38-rc1~54^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c37d9a5de94a6fe60a756af350cd21aa9bbbc8a1;p=~emulex%2Finfiniband.git drm/i915: Fix error handler to capture the first batch after the seqno Whilst we had no older batches on the active list, everything was fine. However, if the GPU is free running and the requests are only being reaped by the periodic retirer, than the current seqno may not be at the start of the list. In this case we need to select the first batch after the last seqno written by the gpu and not inclusive of the seqno. Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index e418e8bb61e..b8e509ae065 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -720,7 +720,7 @@ i915_error_first_batchbuffer(struct drm_i915_private *dev_priv, if (obj->ring != ring) continue; - if (!i915_seqno_passed(obj->last_rendering_seqno, seqno)) + if (i915_seqno_passed(seqno, obj->last_rendering_seqno)) continue; if ((obj->base.read_domains & I915_GEM_DOMAIN_COMMAND) == 0)