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

drm/i915: Remove bogus MST check in intel_dp_has_audio() 



No idea what this MST checks is doing in intel_dp_has_audio().
Looks completely pointless, so get rid of it.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240517145356.26103-8-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent b47e62b1

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

+2 −4
Original line number Diff line number Diff line
@@ -2788,7 +2788,6 @@ 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);
@@ -2797,8 +2796,7 @@ static bool intel_dp_has_audio(struct intel_encoder *encoder, 
	struct intel_connector *connector =

		to_intel_connector(conn_state->connector);



	if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST) &&

	    !intel_dp_port_has_audio(i915, encoder->port))

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

		return false;



	if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
@@ -2857,7 +2855,7 @@ intel_dp_audio_compute_config(struct intel_encoder *encoder, 
			      struct drm_connector_state *conn_state)

{

	pipe_config->has_audio =

		intel_dp_has_audio(encoder, pipe_config, conn_state) &&

		intel_dp_has_audio(encoder, conn_state) &&

		intel_audio_compute_config(encoder, pipe_config, conn_state);



	pipe_config->sdp_split_enable = pipe_config->has_audio &&