From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Decouple GPU error reporting from
 ring initialisation
Date: Mon, 27 Jan 2014 17:13:10 +0100
Message-ID: <20140127161310.GC9772@phenom.ffwll.local>
References: <20140124120612.GC9454@intel.com>
 <1390830754-952-1-git-send-email-chris@chris-wilson.co.uk>
 <20140127140524.GT9454@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <stable-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20140127140524.GT9454@intel.com>
Sender: stable-owner@vger.kernel.org
To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org, Ben Widawsky <ben@bwidawsk.net>, stable@vger.kernel.org
List-Id: intel-gfx@lists.freedesktop.org

On Mon, Jan 27, 2014 at 04:05:24PM +0200, Ville Syrj=E4l=E4 wrote:
> On Mon, Jan 27, 2014 at 01:52:34PM +0000, Chris Wilson wrote:
> > Currently we report through our error state only the rings that hav=
e
> > been initialised (as detected by ring->obj). This check is done aft=
er
> > the GPU reset and ring re-initialisation, which means that the soft=
ware
> > state may not be the same as when we captured the hardware error an=
d we
> > may not print out any of the vital information for debugging the ha=
ng.
> >=20
> > This (and the implied object leak) is a regression from
> >=20
> > commit 3d57e5bd1284f44e325f3a52d966259ed42f9e05
> > Author: Ben Widawsky <ben@bwidawsk.net>
> > Date:   Mon Oct 14 10:01:36 2013 -0700
> >=20
> >     drm/i915: Do a fuller init after reset
> >=20
> > Note that we are already starting to get bug reports with incomplet=
e
> > error states from 3.13.
> >=20
> > v2: Prevent a NULL dereference on 830gm/845g after a GPU reset wher=
e
> >     the scratch obj may be NULL.
> >=20
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Ben Widawsky <ben@bwidawsk.net>
> > Cc: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> > References: https://bugs.freedesktop.org/show_bug.cgi?id=3D74094
> > Cc: stable@vger.kernel.org
>=20
> Looks OK to me.
>=20
> Reviewed-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>

Picked up for -fixes, thanks for the patch. I've also added a tag for t=
he
stable team to fasttrack this one since it's a developer feature.
-Daniel
--=20
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch