From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 01/15] drm/i915: only disable DDI sound if intel_crtc->eld_vld Date: Thu, 7 Mar 2013 11:31:23 +0200 Message-ID: <20130307093123.GQ4469@intel.com> References: <1362611003-4823-1-git-send-email-przanoni@gmail.com> <1362611003-4823-2-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6267DE5DBB for ; Thu, 7 Mar 2013 01:31:28 -0800 (PST) Content-Disposition: inline In-Reply-To: <1362611003-4823-2-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 Wed, Mar 06, 2013 at 08:03:08PM -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. > = > Signed-off-by: Paulo Zanoni > --- > drivers/gpu/drm/i915/intel_ddi.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/inte= l_ddi.c > index 56bb7cb..cd2f519 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -1347,9 +1347,12 @@ static void intel_disable_ddi(struct intel_encoder= *intel_encoder) > ironlake_edp_backlight_off(intel_dp); > } > = > - 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); > + } We set eld_vld=3Dfalse before disabling the crtc in intel_crtc_disable(). I think you need to rearrange that so that we clear eld_vld only after ->crtc_disable has been called. > } > = > int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv) > -- = > 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