From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: handle faked missed interrupts as simulated hangs, too Date: Wed, 30 Oct 2013 10:36:46 +0100 Message-ID: <20131030093646.GD4167@phenom.ffwll.local> References: <1382948653-31350-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 0522CEDCA3 for ; Wed, 30 Oct 2013 02:36:19 -0700 (PDT) Received: by mail-ea0-f170.google.com with SMTP id q10so414129eaj.29 for ; Wed, 30 Oct 2013 02:36:18 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1382948653-31350-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Mon, Oct 28, 2013 at 09:24:13AM +0100, Daniel Vetter wrote: > Otherwise QA will report this as a real hang when running igt > ZZ_missed_irq. > > v2: Actually test the right stuff and really shut up the DRM_ERROR > output ... > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70747 > Tested-by: lu hua > Signed-off-by: Daniel Vetter Merged with Chris' irc-ack. -Daniel > --- > drivers/gpu/drm/i915/i915_irq.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 1a7dc7754e2f..68936da7c25d 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -2258,8 +2258,12 @@ static void i915_hangcheck_elapsed(unsigned long data) > if (waitqueue_active(&ring->irq_queue)) { > /* Issue a wake-up to catch stuck h/w. */ > if (!test_and_set_bit(ring->id, &dev_priv->gpu_error.missed_irq_rings)) { > - DRM_ERROR("Hangcheck timer elapsed... %s idle\n", > - ring->name); > + if (!(dev_priv->gpu_error.test_irq_rings & intel_ring_flag(ring))) > + DRM_ERROR("Hangcheck timer elapsed... %s idle\n", > + ring->name); > + else > + DRM_INFO("Fake missed irq on %s\n", > + ring->name); > wake_up_all(&ring->irq_queue); > } > /* Safeguard against driver failure */ > -- > 1.8.4.rc3 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch