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 00F4C1A4FA6; Thu, 1 Aug 2024 00:24:54 +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=1722471895; cv=none; b=Y4X2iUJAVeJstlQ2Ogxzjkj2rTHyd828LLJGawGfTXTPpbFuj6LJvG8mvB67PTf2AJBVLmlrtLpEWhpEta42iMSFgtQKbu+3rEVV21GKH9toNxPRk/t/xQA7EGIAtBBJRZjelS9f3SoBT69eTcdBIQP+A+dXANFqa53Cv8gdgfI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722471895; c=relaxed/simple; bh=JYUibu9T9JrFP6ao9bNLHOKxT2m4lvus2ioT4oQS0ew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A8RZS6lO1vlsJnyVP16rutN0JZGbtOe6q9tm+AYZQABd5dlsXg2BQPAEu0H5igpT3MpaEHE2/67hKa2gGNybGLAeKc0+qxnoa9zoFBk6j81uvp5LbwkKeoopQqPO92c9W6cOl7z3shJk26GC5xkOGc57Z5IDO7WKJEyzeHPWDSw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ujDWoIHv; 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="ujDWoIHv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8085C4AF11; Thu, 1 Aug 2024 00:24:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722471894; bh=JYUibu9T9JrFP6ao9bNLHOKxT2m4lvus2ioT4oQS0ew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ujDWoIHvXaiavT0jTKod6CCHsY93oqFhuP8igjMqnow3el+YmlH0HFB5cnpL4rIn4 Uk42vAzWoD6ra1yrxzJ9rjuhC7O0wRzzd+b0yhVgE5aAPe/IyZBli/8FxfBep6BC7D 5AJv6I2bDxLC33hTya/cwi0gPsW5528WGARL0DFWuNd6apaVpdRrJ3GSrdh12oAfWY 1rLVraphgxZ4hrBPRdT4g5qrMiEkBtvvvZFdoTS7LRbexMml56KSIhlRFPMBniqNOW o1W96f+XDGrodoIVDWrQbXTECqrUscaIDMs6TvgJ3jMSK9ivA/ap8LCDSOIJLAtcfJ Zwe8uZgdmT6/w== 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, Bhawanpreet.Lakha@amd.com, hersenxs.wu@amd.com, daniel.sa@amd.com, yao.wang1@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 53/83] drm/amd/display: use preferred link settings for dp signal only Date: Wed, 31 Jul 2024 20:18:08 -0400 Message-ID: <20240801002107.3934037-53-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801002107.3934037-1-sashal@kernel.org> References: <20240801002107.3934037-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.6.43 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 16f4865e4246d..3d589072fe307 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 @@ -908,21 +908,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