On Tue, 15 Aug 2023, Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx> wrote: > Extend the SDP split audio config for DP-MST > > Signed-off-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_dp.c | 2 +- > drivers/gpu/drm/i915/display/intel_dp.h | 4 ++++ > drivers/gpu/drm/i915/display/intel_dp_mst.c | 7 +++---- > 3 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index 0eb072a78d44..269828e22437 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2233,7 +2233,7 @@ intel_dp_compute_output_format(struct intel_encoder *encoder, > return ret; > } > > -static void > +void > intel_dp_audio_compute_config(struct intel_encoder *encoder, > struct intel_crtc_state *pipe_config, > struct drm_connector_state *conn_state, > diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h > index e7b515b685ac..b8516a34cfaf 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.h > +++ b/drivers/gpu/drm/i915/display/intel_dp.h > @@ -65,6 +65,10 @@ int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, > struct link_config_limits *limits, > int timeslots, > bool recompute_pipe_bpp); > +void intel_dp_audio_compute_config(struct intel_encoder *encoder, > + struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state, > + struct intel_dp *intel_dp); > bool intel_dp_has_hdmi_sink(struct intel_dp *intel_dp); > bool intel_dp_is_edp(struct intel_dp *intel_dp); > bool intel_dp_is_uhbr(const struct intel_crtc_state *crtc_state); > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c > index 8881cfd41ee7..05228c006a1b 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > @@ -309,10 +309,6 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, > pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB; > pipe_config->has_pch_encoder = false; > > - pipe_config->has_audio = > - intel_dp_has_audio(encoder, conn_state, intel_dp) && > - intel_audio_compute_config(encoder, pipe_config, conn_state); Yeah, so there shouldn't be an intemediate step where you call intel_dp_has_audio() directly from mst code. You just switch from the current code to calling intel_dp_audio_compute_config(). BR, Jani. > - > /* > * for MST we always configure max link bw - the spec doesn't > * seem to suggest we should do otherwise. > @@ -375,6 +371,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, > pipe_config->lane_lat_optim_mask = > bxt_ddi_phy_calc_lane_lat_optim_mask(pipe_config->lane_count); > > + intel_dp_audio_compute_config(encoder, pipe_config, conn_state, intel_dp); > intel_ddi_compute_min_voltage_level(dev_priv, pipe_config); > > return 0; > @@ -779,6 +776,8 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, > intel_de_rmw(dev_priv, CHICKEN_TRANS(trans), 0, > FECSTALL_DIS_DPTSTREAM_DPTTG); > > + intel_audio_sdp_split_update(pipe_config); > + > intel_enable_transcoder(pipe_config); > > intel_crtc_vblank_on(pipe_config); -- Jani Nikula, Intel Open Source Graphics Center
