On Wed, Nov 27, 2013 at 12:01:32PM +0000, Chris Wilson wrote: > Due to user fudging (for instance using video=VGA-1:e with FBDEV=n) we can > attempt to reset an inconsistent CRTC that is marked as active but has > no assigned fb. It would be wise to fix this earlier, but the long > term plan is to have primary and secondary planes associated with a > CRTC, in which crtc->fb being NULL will be expected. So for a quick > short term fix with pretensions of grandeur, just check for a NULL fb > during GPU reset and ignore the plane restoration. > > This fixes a potential hard hang (a panic in the panic handler) > following a GPU hang. > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> Queued for -next (with a small fixme code comment added), thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx