From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D46FC14831F; Tue, 30 Jul 2024 16:49:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722358151; cv=none; b=Db9Bjv28sRcaQ8iTQQb87cfpGPSHdi6jFpwjVnlR4m0JPrWzm5nJSm+9PycDQuID6vkuqYy7lStZCkiSgpwxPDukySMgTerXl6+WJoJjrwzaxRlwSnXCCkTJWigrQeFdYqCcvppPQof86u+TCvnfgXxUikh7cQu9Saaf5/jGkGU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722358151; c=relaxed/simple; bh=sQRzzlc4RFcMiecadPA1fSrNcqiZbrQ0sQbvn6HCmLA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r8b2eKOJ6c0wqAlmZWYhuza5VMhMb3oKI3jzNvL258yUYk89SS9ihmwtm+sCelwZ/jvAYWhgok7sfyPjOs5nUuzqAPPDAjpKPghFXULSqrmiHEBEeIy0LZDMNURtj0uT0ptVD2Fd/XbgT+OL1NpWolMluyS7fK2/FEn2KK3Elag= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LHoUou6o; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LHoUou6o" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49AB8C32782; Tue, 30 Jul 2024 16:49:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722358151; bh=sQRzzlc4RFcMiecadPA1fSrNcqiZbrQ0sQbvn6HCmLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LHoUou6oixHiAcsW0wm2ekf5EagPUZfrdqIrUPbqGZbS1BEZUmlFabhOWDgJqaCZu mC7VNer+hOZWQilH3vJLj2oBpdJAE6cUXl2X/x07lHUVpdgyWJdO7Z+oYJ7BQ1h3ti Kj5EOlLiW6QM+SWw8QAdU3RW0Vy1JdLzvd+63cRQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Ankit Nautiyal , Imre Deak , Tvrtko Ursulin Subject: [PATCH 6.1 361/440] drm/i915/dp: Reset intel_dp->link_trained before retraining the link Date: Tue, 30 Jul 2024 17:49:54 +0200 Message-ID: <20240730151629.914136779@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151615.753688326@linuxfoundation.org> References: <20240730151615.753688326@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Imre Deak commit d13e2a6e95e6b87f571c837c71a3d05691def9bb upstream. Regularly retraining a link during an atomic commit happens with the given pipe/link already disabled and hence intel_dp->link_trained being false. Ensure this also for retraining a DP SST link via direct calls to the link training functions (vs. an actual commit as for DP MST). So far nothing depended on this, however the next patch will depend on link_trained==false for changing the LTTPR mode to non-transparent. Cc: # v5.15+ Cc: Ville Syrjälä Reviewed-by: Ankit Nautiyal Signed-off-by: Imre Deak Link: https://patchwork.freedesktop.org/patch/msgid/20240708190029.271247-2-imre.deak@intel.com (cherry picked from commit a4d5ce61765c08ab364aa4b327f6739b646e6cfa) Signed-off-by: Tvrtko Ursulin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/display/intel_dp.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4089,6 +4089,8 @@ int intel_dp_retrain_link(struct intel_e !intel_dp_mst_is_master_trans(crtc_state)) continue; + intel_dp->link_trained = false; + intel_dp_check_frl_training(intel_dp); intel_dp_pcon_dsc_configure(intel_dp, crtc_state); intel_dp_start_link_train(intel_dp, crtc_state);