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

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

drm/i915: only disable DDI sound if intel_crtc->eld_vld 



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: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 71f8ba6b

drivers/gpu/drm/i915/intel_ddi.c

+7 −4
Original line number Diff line number Diff line
@@ -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;



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

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

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -3864,8 +3864,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);