From: Paulo Zanoni Date: Fri, 22 Mar 2013 17:16:38 +0000 (-0300) Subject: drm/i915: don't touch the PF regs if the power well is down X-Git-Tag: v3.12-rc1~464^2~131^2~174 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7708f78bd51a46abf00ae22ebb1b7deb594fc62;p=kernel%2Fkernel-generic.git drm/i915: don't touch the PF regs if the power well is down This solves some "unclaimed register" messages when booting the machine with eDP attached. V2: Rebase and add the comment requested by Daniel. Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 236d268..51871c2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3599,9 +3599,13 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder); - /* Disable PF */ - I915_WRITE(PF_CTL(pipe), 0); - I915_WRITE(PF_WIN_SZ(pipe), 0); + /* XXX: Once we have proper panel fitter state tracking implemented with + * hardware state read/check support we should switch to only disable + * the panel fitter when we know it's used. */ + if (intel_using_power_well(dev)) { + I915_WRITE(PF_CTL(pipe), 0); + I915_WRITE(PF_WIN_SZ(pipe), 0); + } intel_ddi_disable_pipe_clock(intel_crtc);