From: Imre Deak Date: Mon, 10 Jun 2024 16:49:27 +0000 (+0300) Subject: drm/i915/dp_mst: Reset intel_dp->link_trained during disabling X-Git-Tag: v6.11-rc1~141^2~20^2~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3e70d08409086ada2c864373d9d8b8ef9a55936;p=thirdparty%2Flinux.git drm/i915/dp_mst: Reset intel_dp->link_trained during disabling Reset the flag indicating an active link after disabling an MST link, similarly to how this is done for SST outputs. This avoids trying to retrain an MST link while its disabled. Reviewed-by: Ville Syrjälä Signed-off-by: Imre Deak Link: https://patchwork.freedesktop.org/patch/msgid/20240610164933.2947366-16-imre.deak@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 06fa0641f78f4..e92a10c1f34e1 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -983,6 +983,9 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state, drm_dbg_kms(&i915->drm, "active links %d\n", intel_dp->active_mst_links); + if (intel_dp->active_mst_links == 1) + intel_dp->link_trained = false; + intel_hdcp_disable(intel_mst->connector); intel_dp_sink_disable_decompression(state, connector, old_crtc_state);