On Wed, Nov 18, 2015 at 09:36:46AM +0100, Maarten Lankhorst wrote: > Op 17-11-15 om 18:44 schreef Daniel Vetter: > > On Mon, Nov 02, 2015 at 05:38:07PM +0200, Ville Syrjälä wrote: > >> On Mon, Nov 02, 2015 at 01:41:03PM +0100, Maarten Lankhorst wrote: > >>> Hey, > >>> > >>> Op 30-10-15 om 22:06 schreef ville.syrjala@xxxxxxxxxxxxxxx: > >>>> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > >>>> > >>>> This reverts commit b26a6b35581c84124bd78b68cc02d171fbd572c9. > >>>> > >>>> commit b26a6b35581c ("drm/i915: Make prepare_plane_fb fully interruptible.") > >>>> breaks GPU reset on gen3/4 machines. Go back to to non-interruptible. > >>>> > >>> I've done some digging and by forcing an unconditional modeset during reset I was able to trigger it on my system. > >> Hmm, maybe we should add some kind of debug knob to do just that. That > >> way we could test most of the gen3/4 reset path with gen5+. > >> > >> I thought we already had that for load detection, but I may have > >> imagined it considering that load detection seems to have been > >> broken now for a while. > > We still have it for load detect, including an igt. No one looks at igt > > results though :( > > > > Maarten, can you please take care of both of these before pushing more > > atomic work? And I guess that means that we should apply the revert first. > > So Acked-by: Daniel Vetter <daniel.vetter@xxxxxxxx> on the revert. > > > > Cheers, Daniel > > > Reset is already fixed upstream so reverting wont help. Sorry, I missed that the patch landed already. > What igt is used for load detection then? We're missing it it seems. Iirc Ander was working on it, but only the debugfs part to force-enable load-detect logic was merged into the kernel. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx