On Fri, Mar 22, 2013 at 02:11:43PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zanoni at intel.com> > > We already have the same check on intel_enable_ddi. This patch > prevents "unclaimed register" messages when the power well is > disabled. > > V2: Reset intel_crtc->eld_vld to false after the mode_set function. > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com> Reviewed-by: Ville Syrj?l? <ville.syrjala at linux.intel.com> > --- > drivers/gpu/drm/i915/intel_ddi.c | 9 ++++++--- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > index bfcc58f..cb0d0f7 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -1341,9 +1341,12 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder) > struct drm_i915_private *dev_priv = dev->dev_private; > uint32_t tmp; > > - tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD); > - tmp &= ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << (pipe * 4)); > - I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp); > + if (intel_crtc->eld_vld) { > + tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD); > + tmp &= ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << > + (pipe * 4)); > + I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp); > + } > > if (type == INTEL_OUTPUT_EDP) { > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index ec26a85..188e31f 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3822,8 +3822,8 @@ static void intel_crtc_disable(struct drm_crtc *crtc) > /* crtc should still be enabled when we disable it. */ > WARN_ON(!crtc->enabled); > > - intel_crtc->eld_vld = false; > dev_priv->display.crtc_disable(crtc); > + intel_crtc->eld_vld = false; > intel_crtc_update_sarea(crtc, false); > dev_priv->display.off(crtc); > > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrj?l? Intel OTC