drm/i915/display: combine DP audio compute config steps

Combine all DP audio configs into a single function

Signed-off-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230818111950.128992-3-vinod.govindapillai@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 5b48bfe09d0e684746c8715c44aea2a47697fd2c..7067ee3a4bd36011239faf730f602d41c9831f44 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2631,9 +2631,12 @@ intel_dp_audio_compute_config(struct intel_encoder *encoder,
        struct drm_i915_private *i915 = to_i915(encoder->base.dev);
        struct drm_connector *connector = conn_state->connector;
 
-       pipe_config->sdp_split_enable =
+       pipe_config->has_audio =
                intel_dp_has_audio(encoder, conn_state) &&
-               intel_dp_is_uhbr(pipe_config);
+               intel_audio_compute_config(encoder, pipe_config, conn_state);
+
+       pipe_config->sdp_split_enable = pipe_config->has_audio &&
+                                       intel_dp_is_uhbr(pipe_config);
 
        drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] SDP split enable: %s\n",
                    connector->base.id, connector->name,
@@ -2655,10 +2658,6 @@ intel_dp_compute_config(struct intel_encoder *encoder,
        if (HAS_PCH_SPLIT(dev_priv) && !HAS_DDI(dev_priv) && encoder->port != PORT_A)
                pipe_config->has_pch_encoder = true;
 
-       pipe_config->has_audio =
-               intel_dp_has_audio(encoder, conn_state) &&
-               intel_audio_compute_config(encoder, pipe_config, conn_state);
-
        fixed_mode = intel_panel_fixed_mode(connector, adjusted_mode);
        if (intel_dp_is_edp(intel_dp) && fixed_mode) {
                ret = intel_panel_compute_config(connector, adjusted_mode);