On Mon, Jan 27, 2014 at 04:05:24PM +0200, Ville Syrjälä 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 have > > been initialised (as detected by ring->obj). This check is done after > > the GPU reset and ring re-initialisation, which means that the software > > state may not be the same as when we captured the hardware error and we > > may not print out any of the vital information for debugging the hang. > > > > This (and the implied object leak) is a regression from > > > > commit 3d57e5bd1284f44e325f3a52d966259ed42f9e05 > > Author: Ben Widawsky <ben@xxxxxxxxxxxx> > > Date: Mon Oct 14 10:01:36 2013 -0700 > > > > drm/i915: Do a fuller init after reset > > > > Note that we are already starting to get bug reports with incomplete > > error states from 3.13. > > > > v2: Prevent a NULL dereference on 830gm/845g after a GPU reset where > > the scratch obj may be NULL. > > > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > Cc: Ben Widawsky <ben@xxxxxxxxxxxx> > > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > References: https://bugs.freedesktop.org/show_bug.cgi?id=74094 > > Cc: stable@xxxxxxxxxxxxxxx > > Looks OK to me. > > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Picked up for -fixes, thanks for the patch. I've also added a tag for the stable team to fasttrack this one since it's a developer feature. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html