Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2831d842 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: disable sound first on intel_disable_ddi 



Our mode set sequence documentation says audio must be disabled first.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
[danvet: Resolve conflict since the first patch in this series isn't
applied yet. Also bikeshed commit message as suggested by Ben.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent def27a58

drivers/gpu/drm/i915/intel_ddi.c

+4 −4
Original line number Diff line number Diff line
@@ -1341,15 +1341,15 @@ 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 (type == INTEL_OUTPUT_EDP) {

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



		ironlake_edp_backlight_off(intel_dp);

	}



	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);

}



int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv)