In intel_dp_audio_compute_config() pipe_config->has_audio decision is now based on combination of two condition checks. Split out these condition as two separate checks to facilitate handling has_audio decision when we introduce audio bw checks in the follow up patches. Signed-off-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_dp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index dfe42f4dc2d1..6347258b4a49 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2999,8 +2999,9 @@ intel_dp_audio_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - pipe_config->has_audio = - intel_dp_has_audio(encoder, conn_state) && + pipe_config->has_audio = intel_dp_has_audio(encoder, conn_state); + + pipe_config->has_audio = pipe_config->has_audio && intel_audio_compute_config(pipe_config, conn_state); pipe_config->sdp_split_enable = pipe_config->has_audio && -- 2.34.1