Intel-GFX Archive on lore.kernel.org
 help / color / Atom feed
From: Ben Widawsky <ben@bwidawsk.net>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	intel-gfx <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915: kicking rings considered harmful
Date: Tue, 27 Sep 2011 18:34:31 -0700
Message-ID: <20110927183431.2726c0f5@bwidawsk.net> (raw)
In-Reply-To: <e0d58a$1mj5pp@orsmga002.jf.intel.com>

On Tue, 27 Sep 2011 22:54:01 +0100
Chris Wilson <chris@chris-wilson.co.uk> wrote:

> On Tue, 27 Sep 2011 12:38:59 -0700, Ben Widawsky <ben@bwidawsk.net> wrote:
> > If we do this we lose the possibility to kick rings, but not reset the
> > GPU (not that I find that terribly useful. If we do this, it does fire a
> > wq event, but I don't see a problem with that for this case.
> > 
> > I think I would rather do this:
> > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> > index 012732b..803524e 100644
> > --- a/drivers/gpu/drm/i915/i915_irq.c
> > +++ b/drivers/gpu/drm/i915/i915_irq.c
> > @@ -1698,6 +1698,10 @@ void i915_hangcheck_elapsed(unsigned long data)
> >                 if (dev_priv->hangcheck_count++ > 1) {
> >                         DRM_ERROR("Hangcheck timer elapsed... GPU hung\n");
> >  
> > +                       /* Save off error state before kicking the rings and
> > +                        * possibly ruining the GPU state.
> > +                        */
> > +                       i915_handle_error(dev, true);
> >                         if (!IS_GEN2(dev)) {
> >                                 /* Is the chip hanging on a WAIT_FOR_EVENT?
> >                                  * If so we can simply poke the RB_WAIT bit
> > @@ -1717,7 +1721,6 @@ void i915_hangcheck_elapsed(unsigned long data)
> >                                         goto repeat;
> >                         }
> >  
> > -                       i915_handle_error(dev, true);
> >                         return;
> >                 }
> >         } else {
> 
> Interesting, if we simply call i915_capture_error_state() rather than move
> the i195_handle_error() earlier we do in fact get the best of both worlds.

We can do this except i915_handle_error() is called i915_driver_irq_handler, so
we have to modify that as well. But yeah, I'm fine with that too, though I
don't think it makes much difference either way.

> 
> However, it doesn't address Daniel's statement that kick_rings() provoked
> an unrecoverable hang and so we still need to disable that in order to
> save the error-state. The origin of ring-kicking was to try and recover
> from the modesetting/vsync issues, which apart from the outstanding issue
> in intel_crtc_disable() are behind us. (I hope ;-) We shouldn't be relying
> on i915_reset() and i915.reset=0 tends to be either deliberate or an act of
> desparation so I don't see the issue in also preventing ring-kicking with
> the same parameter. Is there an issue I'm overlooking?

No issue, I just feel that this is redundant to hangcheck_enable, so to me at
least, this just adds extra confusion to an already confusing situation. I seem
to be in the minority though.

To me it's:
reset=0, don't ever try to reset
enable_hangcheck=0, don't ever check if we're hung (ie. don't reset or kick)

And now it's
reset=0, don't every try to reset or kick
enabled_hangcheck=0, don't ever check if we're hung (ie. don't reset or kick)

I'd definitely be in favo(u)r of removing the kick_ring() if it isn't really
useful anymore. It has some forcewake race if I remember correctly which I
never bothered to fix.

> -Chris
> 

Ben

  reply index

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-13  5:38 [2.6.39 regression] hard lock when GNOME starts Andrew Lutomirski
2011-05-13 16:07 ` Andrew Lutomirski
2011-05-13 16:14   ` [PATCH] drm/i915: Revert i915.semaphore=1 default from 47ae63e0 Andy Lutomirski
2011-05-15 23:09     ` Keith Packard
2011-05-19 19:56     ` Keith Packard
2011-05-19 20:50       ` Andrew Lutomirski
2011-05-24 17:10         ` Andrew Lutomirski
2011-05-24 17:46           ` Keith Packard
2011-05-24 20:05           ` Ivan Bulatovic
2011-06-07  7:12         ` Eric Anholt
2011-06-10 14:06           ` Andrew Lutomirski
2011-08-22 16:53             ` Jesse Barnes
2011-08-31 18:24               ` Ben Widawsky
2011-08-31 18:30               ` Andrew Lutomirski
2011-08-31 19:07                 ` Keith Packard
2011-08-31 19:37                   ` Andrew Lutomirski
2011-09-26 17:59                     ` [PATCH] drm/i915: kicking rings considered harmful Daniel Vetter
2011-09-26 19:07                       ` Andrew Lutomirski
2011-09-27  9:57                         ` Daniel Vetter
2011-09-27  5:22                       ` Ben Widawsky
2011-09-27 10:03                         ` Daniel Vetter
2011-09-27 16:46                           ` Ben Widawsky
2011-09-27 17:31                             ` Chris Wilson
2011-09-27 18:03                               ` Daniel Vetter
2011-09-27 19:38                                 ` Ben Widawsky
2011-09-27 21:54                                   ` Chris Wilson
2011-09-28  1:34                                     ` Ben Widawsky [this message]
2011-09-28  8:47                                       ` Chris Wilson
2011-09-28  8:53                                         ` Daniel Vetter
2011-10-03 20:21                                           ` Andrew Lutomirski
2011-10-03 21:02                                             ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110927183431.2726c0f5@bwidawsk.net \
    --to=ben@bwidawsk.net \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Intel-GFX Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/intel-gfx/0 intel-gfx/git/0.git
	git clone --mirror https://lore.kernel.org/intel-gfx/1 intel-gfx/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 intel-gfx intel-gfx/ https://lore.kernel.org/intel-gfx \
		intel-gfx@lists.freedesktop.org
	public-inbox-index intel-gfx

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.freedesktop.lists.intel-gfx


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git