On Fri, Jun 7, 2013 at 9:14 PM, Chris Wilson <chris at chris-wilson.co.uk> wrote: > On Fri, Jun 07, 2013 at 09:10:23PM +0200, Daniel Vetter wrote: >> On Fri, Jun 07, 2013 at 01:47:41PM +0100, Chris Wilson wrote: >> > + if (intel_crtc_set_config(&set)) >> > + __intel_set_mode(crtc, &crtc->mode, >> > + crtc->x, crtc->y, crtc->fb); >> >> Won't this horribly scream in the modeset state checker again if we've >> only partially restored the output state (in case the bios was really >> seriuos about killing our config)? > > I thought that was going to be a useful scream. It should mean that we > have we missing bits in the pipe_config recovery, right? Nope, we've had to rework it to only check at the very end of the force_restore operation, since we still lack an atomic modeset: commit f30da187cdcd0939288038e11fb3bfbd1b655564 Author: Daniel Vetter <daniel.vetter at ffwll.ch> Date: Thu Apr 11 20:22:50 2013 +0200 drm/i915: don't check inconsistent modeset state when force-restoring Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch