On Fri, 18 Aug 2023, Vinod Govindapillai <[email protected]> wrote: > Modify intel_dp_has_audio to handle DP-MST as well. > > Signed-off-by: Vinod Govindapillai <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index 67c06bbc1760..0ee9b9e05c26 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2171,15 +2171,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) &&
That's inaccurate due to INTEL_OUTPUT_EDP. !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) > @@ -2241,7 +2243,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 && -- Jani Nikula, Intel Open Source Graphics Center
