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 B5C2114A605; Thu, 1 Aug 2024 00:15:48 +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=1722471348; cv=none; b=F/U8wwsKw4W7l/IJiUb59VNQc8q8nProybelelv/TZZyaE2GfhEBfG/tkRrm6RKaoL99r9Lh2FeU21c7bCd7rdhQgna65DnpZDpNeLrC2GccIHIQU6REiCzJcT7JXtIPiPaYIBXRA27tDeQoA3xVTRLx1vRXF14C9Wiv540zdSo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722471348; c=relaxed/simple; bh=dA7l3d8Pd4mirZyG70hAEWoWogxof8a8eZPJp9Xt6PY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UZGPssjkU87Omqp0L1x0jygmXz/hOpXlwM9cNPXWD25sAF0bgn6VBLvmxDYkgQcvtmDzihA16jnoeWunRnIhmkLMHBb4yJ+pgrWcJ6VVpcVTOvY85csiXp5jAwrMHpGNm344M41QuCtcEHG6gtR453u+8N4bidAWsoJAt+hz/jg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CbCfuJ0u; 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="CbCfuJ0u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7AB2C32786; Thu, 1 Aug 2024 00:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722471348; bh=dA7l3d8Pd4mirZyG70hAEWoWogxof8a8eZPJp9Xt6PY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CbCfuJ0u5uxEpcD71hLSzZuaSBT6TPaI/rR3MOippjRgcNZXxI/2EJFvCcsBg/XI/ Fqwf/Iiw1fmFibMTw/E/9iiUardMIIjYNrH1U2HJJNlrXscYIpUkiJF/0OepEwG2Oe AlAXA3fgq6XVZ4cwGBliLJYsuGhUmEagHLM5f/IOifnEocYrY6NSqAks31xhzP6PkJ 6dCg6N3I8BxpJnnTL7J35mQopHf0eZnozL38tqTbQbLkIWaQnYP1hFGsa2TmYBkL7p n4bHsNLpwUUMy1OfwT2ebltFn4zj7ZC7kgUE+hMR3EhxRvd5v/IUhfMZPFzM9fQC8o kB9Nr78OUPdyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenjing Liu , Dillon Varone , Zaeem Mohamed , Daniel Wheeler , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, alex.hung@amd.com, george.shen@amd.com, michael.strauss@amd.com, ran.shi@amd.com, sungjoon.kim@amd.com, daniel.sa@amd.com, yao.wang1@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.10 077/121] drm/amd/display: use preferred link settings for dp signal only Date: Wed, 31 Jul 2024 20:00:15 -0400 Message-ID: <20240801000834.3930818-77-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801000834.3930818-1-sashal@kernel.org> References: <20240801000834.3930818-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.2 Content-Transfer-Encoding: 8bit From: Wenjing Liu [ Upstream commit abf34ca465f5cd182b07701d3f3d369c0fc04723 ] [why] We set preferred link settings for virtual signal. However we don't support virtual signal for UHBR link rate. If preferred is set to UHBR link rate, we will allow virtual signal with UHBR link rate which causes system crashes. Reviewed-by: Dillon Varone Acked-by: Zaeem Mohamed Signed-off-by: Wenjing Liu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- .../dc/link/protocols/link_dp_capability.c | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c index b26faed3bb206..a3df1b55e48b7 100644 --- a/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +++ b/drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c @@ -914,21 +914,17 @@ bool link_decide_link_settings(struct dc_stream_state *stream, memset(link_setting, 0, sizeof(*link_setting)); - /* if preferred is specified through AMDDP, use it, if it's enough - * to drive the mode - */ - if (link->preferred_link_setting.lane_count != - LANE_COUNT_UNKNOWN && - link->preferred_link_setting.link_rate != - LINK_RATE_UNKNOWN) { + if (dc_is_dp_signal(stream->signal) && + link->preferred_link_setting.lane_count != LANE_COUNT_UNKNOWN && + link->preferred_link_setting.link_rate != LINK_RATE_UNKNOWN) { + /* if preferred is specified through AMDDP, use it, if it's enough + * to drive the mode + */ *link_setting = link->preferred_link_setting; - return true; - } - - /* MST doesn't perform link training for now - * TODO: add MST specific link training routine - */ - if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) { + } else if (stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST) { + /* MST doesn't perform link training for now + * TODO: add MST specific link training routine + */ decide_mst_link_settings(link, link_setting); } else if (link->connector_signal == SIGNAL_TYPE_EDP) { /* enable edp link optimization for DSC eDP case */ -- 2.43.0