From nobody Mon Feb 9 11:26:52 2026 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 2CFEC13BAF9; Wed, 27 Mar 2024 12:09:35 +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=1711541376; cv=none; b=BHmkOivVJ8WV3z9ETopXVvfk+dD6biTY3YEPKRSGQF6d54pb5QRuYds+98dXIkRCjUb0q9bqeynwzBqWMOALbbMi0nzfAmimr6Vsoqb0g3TXqh7WapZvNbUP6VNx7R9GF7fVOcke15rSOgEKaqs5SU5Bb7nwTXbSa8C5C/vgqcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711541376; c=relaxed/simple; bh=ChsWStqBIftCS6CbNwrC3AKWuzI6qqVONi0WSmbuQcE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fcCXUeKkJU0gGYD2wE+ay9RK/v+OmChLAVhXqA0s/a0gszWjaFX20SdtKHNeGkxMKj71YGvNoGeNjbjjyqo2DRiu+Ti92RABXPHzbNDpbOLjVqzoijACSv19wkPQldHs7PBtGboCWc0o2jovAIZvedD+ofmqB2jwaE6OZA7oAlI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TcKbxQGu; 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="TcKbxQGu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 785F1C433F1; Wed, 27 Mar 2024 12:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711541375; bh=ChsWStqBIftCS6CbNwrC3AKWuzI6qqVONi0WSmbuQcE=; h=From:To:Cc:Subject:Date:From; b=TcKbxQGuYQEFWB5EEhLd4LRK+up/yV1OUdxJgPu2rijFXj6+qbDkwXrMdtnXNJVwP o4036zVHOLNvIYpjN7dG32WptoDtNq1+MGUJyCjzCOV8aq47Z2uxuhr53eCn7LaVhk kn7bo5RM1kcM09EtPfrIEOUoavpow4AxmyQepM96j/Aa4D9W+3Fy0T9pkYX2G20L23 KiwsSeQQFRV2T6CtQj1nqNV00LfDV+XG1/UmuD+b8v4+arrbnnb97+4+omtao/p0Va moM+1MDT2eYmKk3yDUq2OVMvQ2LAx/BG9uKZGcwaURbVzR33Twgz4SlhwVqaG4BbH7 qw+6omY5HL3tQ== 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 6.6-stable tree Date: Wed, 27 Mar 2024 08:09:33 -0400 Message-ID: <20240327120933.2827161-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 6.6-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