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

Commit 9935f7fa authored by Libin Yang's avatar Libin Yang Committed by Jani Nikula
Browse files

drm/i915: abstract ddi being audio enabled 



Prepare for using the same code for judging ddi being audio enabled.
No functional changes.

Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: default avatarLibin Yang <libin.yang@intel.com>
Reviewed-by: default avatarLyude <cpaul@redhat.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480334827-112273-2-git-send-email-libin.yang@intel.com
parent 9a148a96

drivers/gpu/drm/i915/intel_ddi.c

+15 −5
Original line number Diff line number Diff line
@@ -1950,6 +1950,19 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp) 
	udelay(600);

}



bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,

				 struct intel_crtc *intel_crtc)

{

	u32 temp;



	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {

		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);

		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))

			return true;

	}

	return false;

}



void intel_ddi_get_config(struct intel_encoder *encoder,

			  struct intel_crtc_state *pipe_config)

{
@@ -2015,11 +2028,8 @@ void intel_ddi_get_config(struct intel_encoder *encoder, 
		break;

	}



	if (intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO)) {

		temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);

		if (temp & AUDIO_OUTPUT_ENABLE(intel_crtc->pipe))

			pipe_config->has_audio = true;

	}

	pipe_config->has_audio =

		intel_ddi_is_audio_enabled(dev_priv, intel_crtc);



	if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.bpp &&

	    pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {

drivers/gpu/drm/i915/intel_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,8 @@ bool intel_ddi_pll_select(struct intel_crtc *crtc, 
void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);

void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);

bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);

bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,

				 struct intel_crtc *intel_crtc);

void intel_ddi_get_config(struct intel_encoder *encoder,

			  struct intel_crtc_state *pipe_config);

struct intel_encoder *