From: Imre Deak <imre.deak@intel.com>
Date: Mon, 22 Jul 2024 16:54:59 +0000 (+0300)
Subject: drm/i915/dp_mst: Configure MST after the link parameters are reset
X-Git-Tag: v6.12-rc1~126^2~22^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f1fe39ded725483a67c15014a1863179c783b38;p=thirdparty%2Fkernel%2Fstable.git

drm/i915/dp_mst: Configure MST after the link parameters are reset

The MST topology probing depends on the maximum link parameters -
programmed to DPCD if required by a follow-up patch - so make sure these
parameters are up-to-date before configuring and probing the MST
topology.

Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240722165503.2084999-11-imre.deak@intel.com
---

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index c8cf3448fedd9..d707ad666993b 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6020,13 +6020,13 @@ intel_dp_detect(struct drm_connector *connector,
 
 	intel_dp_detect_sdp_caps(intel_dp);
 
-	intel_dp_mst_configure(intel_dp);
-
 	if (intel_dp->reset_link_params) {
 		intel_dp_reset_link_params(intel_dp);
 		intel_dp->reset_link_params = false;
 	}
 
+	intel_dp_mst_configure(intel_dp);
+
 	intel_dp_print_rates(intel_dp);
 
 	if (intel_dp->is_mst) {