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 53802151CE1; Tue, 20 Feb 2024 21:36:44 +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=1708465004; cv=none; b=O5rA41+Tny1XQNUU5+9Wf30TGvLUt+iGL9x4oL9+NuepBXOZznX5PsRRAhMtCCVzGfuloCOkldkyvYuy/o69pyJQbbYGeQbx5NLG9osvFE4CRo8L+auCFCchfikI+HMqiAmEGfIVYTzuc4SBLtvbmMOQm3DFED2SDTeK1b/OunM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708465004; c=relaxed/simple; bh=7HwerKbLnN4GgQT8EhlysiBJxs//bZ+DYg8AcO2Wvj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h6qAefgZkhdlLDlYtywg7FhTnVx1dYgnELA9Byt7QtgTLyWnsY6s4/4q3diuN77gJ3xzKz7qiAOJV/HEUIFoCyZMqJdzqnht+rxb8xc7xGgfG3dEAMl1uogqCPpPFG8Ci2IaaqNbvB/3ZCuV/ZxdB+sAr1GS9zeFETsAn2VfKKc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uLyplOy+; 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="uLyplOy+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2911C433F1; Tue, 20 Feb 2024 21:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708465004; bh=7HwerKbLnN4GgQT8EhlysiBJxs//bZ+DYg8AcO2Wvj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uLyplOy+gZ+fiXL7S5KixYuosUMm+F8HbuZmNJ++WX+ZyDm4bZ9uDx07IdhSWRkRe aXPF3ATqf87de9PBUChHbXU8EqbAd6qSPB+WzF+1ZVUA39QlAALooKReHshgwdOvs7 9ckb/QTtiz+fISJAGhU1x06j+/Z2ToW3cvq/oSy4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mario Limonciello , Alex Deucher , Wenjing Liu , Aurabindo Pillai , Zhikai Zhai , Daniel Wheeler Subject: [PATCH 6.7 206/309] drm/amd/display: Add align done check Date: Tue, 20 Feb 2024 21:56:05 +0100 Message-ID: <20240220205639.634379442@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220205633.096363225@linuxfoundation.org> References: <20240220205633.096363225@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhikai Zhai commit 94b38b895dec8c0ef093140a141e191b60ff614c upstream. [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 Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- 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_ { enum link_training_result status = LINK_TRAINING_SUCCESS; union lane_status lane_status; + union lane_align_status_updated dpcd_lane_status_updated; uint8_t dpcd_buf[6] = {0}; uint32_t lane; @@ -532,10 +533,12 @@ enum link_training_result dp_check_link_ * check lanes status */ lane_status.raw = dp_get_nibble_at_index(&dpcd_buf[2], lane); + dpcd_lane_status_updated.raw = dpcd_buf[4]; 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