Commit 1bd1817b authored by Vinod Govindapillai's avatar Vinod Govindapillai Committed by Jani Nikula
Browse files

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



Combine all DP audio configs into a single function

Signed-off-by: default avatarVinod Govindapillai <vinod.govindapillai@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230818111950.128992-3-vinod.govindapillai@intel.com
parent 2f092c0c

drivers/gpu/drm/i915/display/intel_dp.c

+5 −6
Original line number Diff line number Diff line
@@ -2631,8 +2631,11 @@ 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_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",
@@ -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);