mirror of
https://github.com/torvalds/linux.git
synced 2026-06-02 19:43:40 +02:00
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: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240517145356.26103-8-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
b47e62b1ed
commit
574884438c
|
|
@ -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 &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user