On Tue, Jul 07, 2015 at 12:50:39PM +0200, Maarten Lankhorst wrote: > Op 07-07-15 om 11:48 schreef Daniel Vetter: > > On Tue, Jul 07, 2015 at 09:08:25AM +0200, Maarten Lankhorst wrote: > >> Calculate all state using a normal transition, but afterwards fudge > >> crtc->state->active back to its old value. This should still allow > >> state restore in setup_hw_state to work properly. > >> > >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90396 > >> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > > What we could do here (just as an experiment really, I haven't thought > > through the implications for locking) is duplicate the state here _before_ > > we suspend everything. Then on force_restore we just use the saved state > > from here for resuming. Would get rid of the failures on resume. > > > > Otoh we need that code for the lid notifier still, so probably meh. > > > Or make a intel_duplicate_state helper and then swap the sw state back. > I think that might be overkill and just patching up crtc_state->active afterwards > is fine. The restore on resume performs a full recheck anyway. Yeah was really just an idea, current patch looks fine. -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