On Fri, May 03, 2013 at 12:15:40PM -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.
> V3: Add both "type != INTEL_OUTPUT_EDP" requested.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>
Meh, intel_crtc->eld_vld is a horrible piece of state tracking. I'll jot
down a "add has_audio to pipe_config" task for me.
Anyway, we can polish this turd later on, all patches merged to dinq.
Thanks, Daniel
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 11 +++++++----
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 3ff4de6..21fb852 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1300,7 +1300,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
> ironlake_edp_backlight_on(intel_dp);
> }
>
> - if (intel_crtc->eld_vld) {
> + if (intel_crtc->eld_vld && type != INTEL_OUTPUT_EDP) {
> 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);
> @@ -1318,9 +1318,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 && type != INTEL_OUTPUT_EDP) {
> + 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 fcb1367..7aa2295 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3855,8 +3855,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
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
