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

Commit c1dec79a authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: enable audio codec after port 



As per spec, and similar to DDI.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 495a5bb8

drivers/gpu/drm/i915/intel_dp.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -1324,12 +1324,8 @@ static void intel_dp_prepare(struct intel_encoder *encoder) 
	intel_dp->DP |= DP_VOLTAGE_0_4 | DP_PRE_EMPHASIS_0;

	intel_dp->DP |= DP_VOLTAGE_0_4 | DP_PRE_EMPHASIS_0;

	intel_dp->DP |= DP_PORT_WIDTH(intel_dp->lane_count);

	intel_dp->DP |= DP_PORT_WIDTH(intel_dp->lane_count);





	if (crtc->config.has_audio) {

	if (crtc->config.has_audio)

		DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n",

				 pipe_name(crtc->pipe));

		intel_dp->DP |= DP_AUDIO_OUTPUT_ENABLE;

		intel_dp->DP |= DP_AUDIO_OUTPUT_ENABLE;

		intel_audio_codec_enable(encoder);

	}





	/* Split out the IBX/CPU vs CPT settings */

	/* Split out the IBX/CPU vs CPT settings */
@@ -2636,6 +2632,7 @@ static void intel_enable_dp(struct intel_encoder *encoder) 
	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);

	struct drm_device *dev = encoder->base.dev;

	struct drm_device *dev = encoder->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);

	uint32_t dp_reg = I915_READ(intel_dp->output_reg);

	uint32_t dp_reg = I915_READ(intel_dp->output_reg);





	if (WARN_ON(dp_reg & DP_PORT_EN))

	if (WARN_ON(dp_reg & DP_PORT_EN))
@@ -2661,6 +2658,12 @@ static void intel_enable_dp(struct intel_encoder *encoder) 
	intel_dp_start_link_train(intel_dp);

	intel_dp_start_link_train(intel_dp);

	intel_dp_complete_link_train(intel_dp);

	intel_dp_complete_link_train(intel_dp);

	intel_dp_stop_link_train(intel_dp);

	intel_dp_stop_link_train(intel_dp);



	if (crtc->config.has_audio) {

		DRM_DEBUG_DRIVER("Enabling DP audio on pipe %c\n",

				 pipe_name(crtc->pipe));

		intel_audio_codec_enable(encoder);

	}

}

}





static void g4x_enable_dp(struct intel_encoder *encoder)

static void g4x_enable_dp(struct intel_encoder *encoder)

drivers/gpu/drm/i915/intel_hdmi.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -661,14 +661,6 @@ static void intel_hdmi_prepare(struct intel_encoder *encoder) 
	if (crtc->config.has_hdmi_sink)

	if (crtc->config.has_hdmi_sink)

		hdmi_val |= HDMI_MODE_SELECT_HDMI;

		hdmi_val |= HDMI_MODE_SELECT_HDMI;





	if (crtc->config.has_audio) {

		WARN_ON(!crtc->config.has_hdmi_sink);

		DRM_DEBUG_DRIVER("Enabling HDMI audio on pipe %c\n",

				 pipe_name(crtc->pipe));

		hdmi_val |= SDVO_AUDIO_ENABLE;

		intel_audio_codec_enable(encoder);

	}



	if (HAS_PCH_CPT(dev))

	if (HAS_PCH_CPT(dev))

		hdmi_val |= SDVO_PIPE_SEL_CPT(crtc->pipe);

		hdmi_val |= SDVO_PIPE_SEL_CPT(crtc->pipe);

	else if (IS_CHERRYVIEW(dev))

	else if (IS_CHERRYVIEW(dev))
@@ -791,6 +783,13 @@ static void intel_enable_hdmi(struct intel_encoder *encoder) 
		I915_WRITE(intel_hdmi->hdmi_reg, temp);

		I915_WRITE(intel_hdmi->hdmi_reg, temp);

		POSTING_READ(intel_hdmi->hdmi_reg);

		POSTING_READ(intel_hdmi->hdmi_reg);

	}

	}



	if (intel_crtc->config.has_audio) {

		WARN_ON(!intel_crtc->config.has_hdmi_sink);

		DRM_DEBUG_DRIVER("Enabling HDMI audio on pipe %c\n",

				 pipe_name(intel_crtc->pipe));

		intel_audio_codec_enable(encoder);

	}

}

}





static void vlv_enable_hdmi(struct intel_encoder *encoder)

static void vlv_enable_hdmi(struct intel_encoder *encoder)