On 05/10/2012 11:48 AM, Daniel Vetter wrote: > On Wed, May 09, 2012 at 08:29:57PM -0300, Eugeni Dodonov wrote: >> This attempts to enable all the available power wells during the >> initialization. >> >> Those power wells can be enabled in parallel or on-demand, and disabled >> when no longer needed, but this is out of scope of this initial >> enablement. Proper tracking of who uses which power well will require >> a considerable rework of our display handling, so we just leave them all >> enabled when the driver is loaded for now. >> >> v2: use more generic and future-proof code >> >> v3: call intel_init_power_wells from within intel_modeset_init_hw, so it >> would be called upon resume path as well. >> >> Signed-off-by: Eugeni Dodonov<eugeni.dodonov at intel.com> > > I've picked up everything up to this one here into dinq. Can you please > double-check whether the power well enabling is still at the right place? > I've somehow dropped Chris' patch to move around things for the rps stuff > that I've merged yesterday, but now it's back as: > > commit 2e1352cf196094f44e73776f41087f4c489ab936 > Author: Chris Wilson<chris at chris-wilson.co.uk> > Date: Wed May 9 11:56:28 2012 +0100 > > drm/i915: gen6_enable_rps() wants to be called after ring > initialisation > > Cheers, Daniel I re-tested with latest drm-intel-next-queued (with everything applied up to this patch), and applied the remaining patches on top of it - including this power wells patch - and confirmed that it still works. I haven't tested suspend-resume yet (as this does not works yet anyway :)).
