From nobody Fri May 10 00:14:39 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 4D87C15B54D; Wed, 27 Mar 2024 12:18:25 +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=1711541905; cv=none; b=OIdonizlyQalAv46PI55MVTlbkKF8NlcYNMI5tMzPMy3wrTgqe9S246Z6fODGywVwUAWoyJAyWeOIzyW+PeL14/11vkwX57rDpIMvPjdE8NptDcydSME5uIOhlZ0cP/HgMEM+4gZTFNQjhymdXErLvqu3GS0Sn5lcifBl5syQd8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541905; c=relaxed/simple; bh=zQNlCC7ZAzYOedCZVlT+gS5muKviOdhRrBYesFA+H0g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Qts9fy7iKn0vThD9ZJpsiFztDQSfqzs0GdMppFygIkcd02P8rz3WbtSSiWlDaHnx2C/9thKmp3CLSOh2/sjhhjH1l4jN857/RNgL0tAiJOJegm8t37iAaEFW8xwUwkGWOUofJe9gviWAuOk/uuu7UV3xPSJJgzkGWq3kod9OiF8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VS7DIgeG; 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="VS7DIgeG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E578EC43330; Wed, 27 Mar 2024 12:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541905; bh=zQNlCC7ZAzYOedCZVlT+gS5muKviOdhRrBYesFA+H0g=; h=From:To:Cc:Subject:Date:From; b=VS7DIgeGUfTS2KU/RcdlXEWffmgIRSBlTmpEXJp83DfScNWKYkHq4CsLqNj6eJ8d1 2FhX+hPH727cEIaGbS5nSV6W5g8gV9+myqoAeCns63mNFtlliSJ93ndQ9sl51bhY4z fiNFBp5au+kccu6P/oOraemGyJfVyZ1nxKN6LX2i0ZXoic4Uxh/vyXF2qqTak8qkMC CTt/S7UueTSHKuhchmHnjxxelx8YJcNNR4xt/yL0tlcSCbI2KcINOZ1IS8NOww2zPH VDZ7YMF13zHvfpFXQ6X126/E9+34UN7FBQ6kbG/C4hF6WWoZoS9RWnwCI052FHcaeF 6LIJfNciUjM3g== From: Sasha Levin To: stable@vger.kernel.org, wenjing.liu@amd.com Cc: Mario Limonciello , Alex Deucher , Chaitanya Dhere , Martin Leung , Wayne Lin , Daniel Wheeler , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: FAILED: Patch "drm/amd/display: Revert Remove pixle rate limit for subvp" failed to apply to 5.10-stable tree Date: Wed, 27 Mar 2024 08:18:22 -0400 Message-ID: <20240327121823.2834303-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.10-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: Wayne Lin Reviewed-by: Chaitanya Dhere Reviewed-by: Martin Leung Tested-by: Daniel Wheeler ------------------ original commit in Linus's tree ------------------ From cf8c498694a443e28dc1222f3ab94677114a4724 Mon Sep 17 00:00:00 2001 From: Wenjing Liu Date: Mon, 4 Mar 2024 11:20:27 -0500 Subject: [PATCH] drm/amd/display: Revert Remove pixle rate limit for subvp This reverts commit 340383c734f8 ("drm/amd/display: Remove pixle rate limit for subvp") [why] The original commit causes a regression when subvp is applied on ODM required 8k60hz timing. The display shows black screen on boot. The issue can be recovered with hotplug. It also causes MPO to fail. We will temprarily revert this commit and investigate the root cause further. Cc: Mario Limonciello Cc: Alex Deucher Cc: stable@vger.kernel.org Reviewed-by: Chaitanya Dhere Reviewed-by: Martin Leung Acked-by: Wayne Lin Signed-off-by: Wenjing Liu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c b/drivers= /gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c index b49e1dc9d8ba5..a0a65e0991041 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c @@ -623,6 +623,7 @@ static bool dcn32_assign_subvp_pipe(struct dc *dc, * - Not TMZ surface */ if (pipe->plane_state && !pipe->top_pipe && !dcn32_is_center_timing(pipe= ) && + !(pipe->stream->timing.pix_clk_100hz / 10000 > DCN3_2_MAX_SUBVP_PIXEL_= RATE_MHZ) && (!dcn32_is_psr_capable(pipe) || (context->stream_count =3D=3D 1 && dc-= >caps.dmub_caps.subvp_psr)) && dc_state_get_pipe_subvp_type(context, pipe) =3D=3D SUBVP_NONE && (refresh_rate < 120 || dcn32_allow_subvp_high_refresh_rate(dc, context= , pipe)) && --=20 2.43.0