For the complete audio compute config calculations, we would need to have the transcoder M/N values as well. So move intel_dp_audio_compute_config after the transcoder M/N values are calculated in intel_link_compute_m_n().This becomes more relevant after the follow-up patches where we will need to assess if an audio frequency can be supported with a pipe config. Signed-off-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx> Reviewed-by: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 053a9a4182e7..888bcc549ddb 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3170,8 +3170,6 @@ intel_dp_compute_config(struct intel_encoder *encoder, adjusted_mode->crtc_clock /= n; } - intel_dp_audio_compute_config(encoder, pipe_config, conn_state); - intel_link_compute_m_n(link_bpp_x16, pipe_config->lane_count, adjusted_mode->crtc_clock, @@ -3179,6 +3177,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, intel_dp_bw_fec_overhead(pipe_config->fec_enable), &pipe_config->dp_m_n); + intel_dp_audio_compute_config(encoder, pipe_config, conn_state); + /* FIXME: abstract this better */ if (pipe_config->splitter.enable) pipe_config->dp_m_n.data_m *= pipe_config->splitter.link_count; -- 2.34.1
