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

Commit 2210ce7f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Replace some open coded intel_crtc_has_dp_encoder()s 



A bunch of places still look for DP encoders manually. Just call
intel_crtc_has_dp_encoder(). Note that many of these places don't
look for EDP or DP_MST, but it's still fine to replace them because
* for audio we don't enable audio on eDP anyway
* the code that lack DP MST check is only for plaforms that
  don't support MST anyway

v2: Rebase

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466621833-5054-8-git-send-email-ville.syrjala@linux.intel.com
parent 37a5650b

drivers/gpu/drm/i915/intel_audio.c

+5 −5
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) 
	tmp |= AUD_CONFIG_N_PROG_ENABLE;

	tmp &= ~AUD_CONFIG_UPPER_N_MASK;

	tmp &= ~AUD_CONFIG_LOWER_N_MASK;

	if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DISPLAYPORT))

	if (intel_crtc_has_dp_encoder(intel_crtc->config))

		tmp |= AUD_CONFIG_N_VALUE_INDEX;

	I915_WRITE(HSW_AUD_CFG(pipe), tmp);
@@ -328,7 +328,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector, 
	tmp = I915_READ(HSW_AUD_CFG(pipe));

	tmp &= ~AUD_CONFIG_N_VALUE_INDEX;

	tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;

	if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DISPLAYPORT))

	if (intel_crtc_has_dp_encoder(intel_crtc->config))

		tmp |= AUD_CONFIG_N_VALUE_INDEX;

	else

		tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
@@ -389,7 +389,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder) 
	tmp |= AUD_CONFIG_N_PROG_ENABLE;

	tmp &= ~AUD_CONFIG_UPPER_N_MASK;

	tmp &= ~AUD_CONFIG_LOWER_N_MASK;

	if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DISPLAYPORT))

	if (intel_crtc_has_dp_encoder(intel_crtc->config))

		tmp |= AUD_CONFIG_N_VALUE_INDEX;

	I915_WRITE(aud_config, tmp);
@@ -475,7 +475,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, 
	tmp &= ~AUD_CONFIG_N_VALUE_INDEX;

	tmp &= ~AUD_CONFIG_N_PROG_ENABLE;

	tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;

	if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DISPLAYPORT))

	if (intel_crtc_has_dp_encoder(intel_crtc->config))

		tmp |= AUD_CONFIG_N_VALUE_INDEX;

	else

		tmp |= audio_config_hdmi_pixel_clock(adjusted_mode);
@@ -513,7 +513,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) 


	/* ELD Conn_Type */

	connector->eld[5] &= ~(3 << 2);

	if (intel_crtc_has_type(crtc->config, INTEL_OUTPUT_DISPLAYPORT))

	if (intel_crtc_has_dp_encoder(crtc->config))

		connector->eld[5] |= (1 << 2);



	connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;

drivers/gpu/drm/i915/intel_display.c

+1 −2
Original line number Diff line number Diff line
@@ -7393,8 +7393,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, 


	coreclk = vlv_dpio_read(dev_priv, pipe, VLV_PLL_DW7(pipe));

	coreclk = (coreclk & 0x0000ff00) | 0x01c00000;

	if (intel_crtc_has_type(crtc->config, INTEL_OUTPUT_DISPLAYPORT) ||

	    intel_crtc_has_type(crtc->config, INTEL_OUTPUT_EDP))

	if (intel_crtc_has_dp_encoder(crtc->config))

		coreclk |= 0x01000000;

	vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW7(pipe), coreclk);