FAILED: patch "[PATCH] drm/amd/display: Update min Z8 residency time to 2100 for" failed to apply to 6.1-stable tree

The patch below does not apply to the 6.1-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 <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x d642b0100bf8c95e88e8396b7191b35807dabb4c
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024012751-payment-luckless-5da3@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

d642b0100bf8 ("drm/amd/display: Update min Z8 residency time to 2100 for DCN314") 8b8eed05a1c6 ("drm/amd/display: Refactor resource into component directory") e53524cdcc02 ("drm/amd/display: Refactor HWSS into component folder") 6e2c4941ce0c ("drm/amd/display: Move dml code under CONFIG_DRM_AMD_DC_FP guard") 45e7649fd191 ("drm/amd/display: Add DCN35 CORE")
1cb87e048975 ("drm/amd/display: Add DCN35 blocks to Makefile") 0fa45b6aeae4 ("drm/amd/display: Add DCN35 Resource")
ec129fa356be ("drm/amd/display: Add DCN35 init")
6f8b7565cca4 ("drm/amd/display: Add DCN35 HWSEQ")
927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable") 927e784c180c ("drm/amd/display: Add symclk enable/disable during stream enable/disable")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d642b0100bf8c95e88e8396b7191b35807dabb4c Mon Sep 17 00:00:00 2001
From: Nicholas Kazlauskas <[email protected]>
Date: Wed, 8 Nov 2023 10:59:00 -0500
Subject: [PATCH] drm/amd/display: Update min Z8 residency time to 2100 for
DCN314

[Why]
Some panels with residency period of 2054 exhibit flickering with Z8 at the end of the frame.

[How]
As a workaround, increase the limit to block these panels.

index 677361d74a4e..c97391edb5ff 100644
@@ -871,7 +871,7 @@ static const struct dc_plane_cap plane_cap = {
 static const struct dc_debug_options debug_defaults_drv = {
 	.disable_z10 = false,
 	.enable_z9_disable_interface = true,
-	.minimum_z8_residency_time = 2000,
+	.minimum_z8_residency_time = 2100,
 	.psr_skip_crtc_disable = true,
 	.replay_skip_crtc_disabled = true,
 	.disable_dmcu = true,