From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 2/7] drm/i915: only disable DDI sound if intel_crtc->eld_vld Date: Fri, 22 Mar 2013 20:11:28 +0200 Message-ID: <20130322181128.GT4469@intel.com> References: <1362611003-4823-2-git-send-email-przanoni@gmail.com> <1363972303-2672-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id F21DDE5C6B for ; Fri, 22 Mar 2013 11:11:31 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1363972303-2672-1-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 22, 2013 at 02:11:43PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni > = > 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 Reviewed-by: Ville Syrj=E4l=E4 > --- > 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/inte= l_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 =3D dev->dev_private; > uint32_t tmp; > = > - tmp =3D I915_READ(HSW_AUD_PIN_ELD_CP_VLD); > - tmp &=3D ~((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 =3D I915_READ(HSW_AUD_PIN_ELD_CP_VLD); > + tmp &=3D ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << > + (pipe * 4)); > + I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp); > + } > = > if (type =3D=3D INTEL_OUTPUT_EDP) { > struct intel_dp *intel_dp =3D 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 *crt= c) > /* crtc should still be enabled when we disable it. */ > WARN_ON(!crtc->enabled); > = > - intel_crtc->eld_vld =3D false; > dev_priv->display.crtc_disable(crtc); > + intel_crtc->eld_vld =3D false; > intel_crtc_update_sarea(crtc, false); > dev_priv->display.off(crtc); > = > -- = > 1.7.10.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC