From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH] drm/i915: kicking rings considered harmful
Date: Tue, 27 Sep 2011 12:03:22 +0200
Message-ID: <20110927100322.GA2785@phenom.ffwll.local>
References: <CAObL_7Hi+c2aEtEMzrMNnrQXfnUmNY_ZnP==xCd7egMoKBow_g@mail.gmail.com>
	<1317059990-1922-1-git-send-email-daniel.vetter@ffwll.ch>
	<20110926222201.1ca2afcd@bwidawsk.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mail-fx0-f49.google.com (mail-fx0-f49.google.com
	[209.85.161.49])
	by gabe.freedesktop.org (Postfix) with ESMTP id 6C0B79ED5B
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 27 Sep 2011 03:09:43 -0700 (PDT)
Received: by fxg7 with SMTP id 7so8801219fxg.36
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 27 Sep 2011 03:09:42 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <20110926222201.1ca2afcd@bwidawsk.net>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=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: Ben Widawsky <ben@bwidawsk.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

On Mon, Sep 26, 2011 at 10:22:01PM -0700, Ben Widawsky wrote:
> On Mon, 26 Sep 2011 19:59:50 +0200
> Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > diff --git a/drivers/gpu/drm/i915/i915_irq.c
> > b/drivers/gpu/drm/i915/i915_irq.c index da5d607..09c11e4 100644
> > --- a/drivers/gpu/drm/i915/i915_irq.c
> > +++ b/drivers/gpu/drm/i915/i915_irq.c
> > @@ -1694,7 +1694,7 @@ void i915_hangcheck_elapsed(unsigned long data)
> >  		if (dev_priv->hangcheck_count++ > 1) {
> >  			DRM_ERROR("Hangcheck timer elapsed... GPU
> > hung\n"); 
> > -			if (!IS_GEN2(dev)) {
> > +			if (!IS_GEN2(dev) && i915_try_reset) {
> >  				/* Is the chip hanging on a
> > WAIT_FOR_EVENT?
> >  				 * If so we can simply poke the
> > RB_WAIT bit
> >  				 * and break the hang. This should
> > work on
> 
> I think you should also be able to accomplish the same thing
> with enable_hangcheck param. I had the same problem with the
> debugger :)

I agree. Iirc you have some patches floating in that area to make the
hangcheck a bit more robust. Can you maybe add this to that series and
(re-)submit?

Cheers, Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48