Commit 2e775f2d authored by Vinod Govindapillai's avatar Vinod Govindapillai Committed by Jani Nikula
Browse files

drm/i915/display: update intel_dp_has_audio to support MST 



Modify intel_dp_has_audio to handle DP-MST as well.

v1: fix the wrong port comparison (Jani Nikula)

Signed-off-by: default avatarVinod Govindapillai <vinod.govindapillai@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230822204818.109742-2-vinod.govindapillai@intel.com
parent f1f959d5

drivers/gpu/drm/i915/display/intel_dp.c

+6 −4
Original line number Diff line number Diff line
@@ -2562,15 +2562,17 @@ intel_dp_drrs_compute_config(struct intel_connector *connector, 
}



static bool intel_dp_has_audio(struct intel_encoder *encoder,

			       struct intel_crtc_state *crtc_state,

			       const struct drm_connector_state *conn_state)

{

	struct drm_i915_private *i915 = to_i915(encoder->base.dev);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

	struct intel_connector *connector = intel_dp->attached_connector;

	const struct intel_digital_connector_state *intel_conn_state =

		to_intel_digital_connector_state(conn_state);

	struct intel_connector *connector =

		to_intel_connector(conn_state->connector);



	if (!intel_dp_port_has_audio(i915, encoder->port))

	if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST) &&

	    !intel_dp_port_has_audio(i915, encoder->port))

		return false;



	if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
@@ -2632,7 +2634,7 @@ intel_dp_audio_compute_config(struct intel_encoder *encoder, 
	struct drm_connector *connector = conn_state->connector;



	pipe_config->has_audio =

		intel_dp_has_audio(encoder, conn_state) &&

		intel_dp_has_audio(encoder, pipe_config, conn_state) &&

		intel_audio_compute_config(encoder, pipe_config, conn_state);



	pipe_config->sdp_split_enable = pipe_config->has_audio &&