From nobody Sat May 11 13:49:08 2024 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 3C78C13A253; Wed, 27 Mar 2024 12:17:53 +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=1711541873; cv=none; b=sRlR39YoAF5CgXKdixGsmL2iLkd14QMtR7HNjo56/wJNt9Ya0zEWBf7LdCzPL0FfDMtwSSsJgZhO+zS6nusC6jNIIwXgu1zvodq99VCbflO3dr1TPSYWYhDGrVut8EUQ3eDG9kfLVz8ggnXuJYDcoHfvi8kCo2B5negQpRkuntA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541873; c=relaxed/simple; bh=Ps/Z4G0H8lVxNRgnBkKb/iaYDU6yzgFyX19+DXzk1EE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rBtTIcn5cBKMqQ4txZ0yQIRnkjDZYvTicybnp3jxOZJ+nrKJs6cQrQnN0Dz7ug5IFx6unAt2i6/t2Wp+d9UUdEh7/qDBARP3ozAxqHx8hLXnLMR0D9HF/Cp0w46yCfMnslcU3XQq2ZgjUAmsvwWBLD9MEamP+d/zQsR2iw4BdE8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E8dQSIGJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="E8dQSIGJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05D07C43390; Wed, 27 Mar 2024 12:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541873; bh=Ps/Z4G0H8lVxNRgnBkKb/iaYDU6yzgFyX19+DXzk1EE=; h=From:To:Cc:Subject:Date:From; b=E8dQSIGJq3RMetaj2vevLTdHq0zAeqwUjRnxA2aN0+gAmS9FEqoQ5YVe5tQIDWDc0 tRNn46bVRmkYxAaLVgAMTkD62zArT96vHersnT6d5Ayl2RcKlqzboLmweQK56Sx0FK nEtSDyYbHzuazCmEkdr3HLSBjJHCpdcIj/dvWeeifOzmy9YTj+yt6G0qY0v59LqPla 9dEtkE3YdfEUOyDFXYY+qIiQXD+0baicRUSa0qwJuPiO3YmWeIS3TYrJcaicbVte7D c+Sm/YJ7hfr5JqpnKA6I7q38oCOfTrkJH7P3Aj9IIIuu/5ORYqSQnlPmP3WcaPtdiP cqapc4zIlb2yw== From: Sasha Levin To: stable@vger.kernel.org, zhikai.zhai@amd.com Cc: Mario Limonciello , Alex Deucher , Wenjing Liu , Aurabindo Pillai , Daniel Wheeler , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/amd/display: Add align done check" failed to apply to 5.15-stable tree Date: Wed, 27 Mar 2024 08:17:50 -0400 Message-ID: <20240327121751.2833844-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha Acked-by: Aurabindo Pillai Reviewed-by: Wenjing Liu Tested-by: Daniel Wheeler ------------------ original commit in Linus's tree ------------------ From 1b5078f01b953a43d6198180ca5b110017315672 Mon Sep 17 00:00:00 2001 From: Zhikai Zhai Date: Mon, 29 Jan 2024 17:02:18 +0800 Subject: [PATCH] drm/amd/display: Add align done check [WHY] We Double-check link status if training successful, but miss the lane align status. [HOW] Add the lane align status check Cc: Mario Limonciello Cc: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Wenjing Liu Acked-by: Aurabindo Pillai Signed-off-by: Zhikai Zhai Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- .../gpu/drm/amd/display/dc/link/protocols/link_dp_training.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training= .c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c index e06d3c2d89102..e538c67d3ed91 100644 --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c @@ -517,6 +517,7 @@ enum link_training_result dp_check_link_loss_status( { enum link_training_result status =3D LINK_TRAINING_SUCCESS; union lane_status lane_status; + union lane_align_status_updated dpcd_lane_status_updated; uint8_t dpcd_buf[6] =3D {0}; uint32_t lane; =20 @@ -532,10 +533,12 @@ enum link_training_result dp_check_link_loss_status( * check lanes status */ lane_status.raw =3D dp_get_nibble_at_index(&dpcd_buf[2], lane); + dpcd_lane_status_updated.raw =3D dpcd_buf[4]; =20 if (!lane_status.bits.CHANNEL_EQ_DONE_0 || !lane_status.bits.CR_DONE_0 || - !lane_status.bits.SYMBOL_LOCKED_0) { + !lane_status.bits.SYMBOL_LOCKED_0 || + !dp_is_interlane_aligned(dpcd_lane_status_updated)) { /* if one of the channel equalization, clock * recovery or symbol lock is dropped * consider it as (link has been --=20 2.43.0