From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 03/10] drm/i915: kill waiting_seqno Date: Sun, 22 Apr 2012 14:46:05 +0100 Message-ID: <1335102395_20078@CP5-2952> References: <1334971412-4826-1-git-send-email-ben@bwidawsk.net> <1334971412-4826-4-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C20A9E70A for ; Sun, 22 Apr 2012 06:46:42 -0700 (PDT) In-Reply-To: <1334971412-4826-4-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Ben Widawsky , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org On Fri, 20 Apr 2012 18:23:25 -0700, Ben Widawsky wrote: > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index cf0e9f0..52eb9ed 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1846,11 +1846,9 @@ static bool i915_hangcheck_ring_idle(struct intel_ring_buffer *ring, bool *err) So ring->waiting_seqno was also in effect checking that the ring was initialised here. Inappropriately, I might add. Anyway we need: if (ring->obj == NULL) return true; > if (list_empty(&ring->request_list) || > i915_seqno_passed(ring->get_seqno(ring), ring_last_seqno(ring))) { > /* Issue a wake-up to catch stuck h/w. */ > - if (ring->waiting_seqno && waitqueue_active(&ring->irq_queue)) { > - DRM_ERROR("Hangcheck timer elapsed... %s idle [waiting on %d, at %d], missed IRQ?\n", > - ring->name, > - ring->waiting_seqno, > - ring->get_seqno(ring)); > + if (waitqueue_active(&ring->irq_queue)) { > + DRM_ERROR("Hangcheck timer elapsed... %s idle\n", > + ring->name); > wake_up_all(&ring->irq_queue); > *err = true; > } -- Chris Wilson, Intel Open Source Technology Centre