This is a note to let you know that I've just added the patch titled
Revert "Revert "drm/amdgpu/display: change pipe policy for DCN 2.0""
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-revert-drm-amdgpu-display-change-pipe-policy-for-dcn-2.0.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6ecc10295abb2fdd9c21dd17b34e4cacfd829cd4 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Tue, 15 Aug 2023 17:25:37 -0400
Subject: Revert "Revert "drm/amdgpu/display: change pipe policy for DCN 2.0""
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 6ecc10295abb2fdd9c21dd17b34e4cacfd829cd4 upstream.
This reverts commit 27dd79c00aeab36cd7542c7a4481a32549038659.
It appears MPC_SPLIT_DYNAMIC still causes problems with multiple
displays on DCN2.0 hardware. Switch back to MPC_SPLIT_AVOID_MULT_DISP.
This increases power usage with multiple displays, but avoids hangs.
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2475
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx>
Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # 6.4.x
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index 4cc8de2627ce..9f2e24398cd7 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -712,7 +712,7 @@ static const struct dc_debug_options debug_defaults_drv = {
.timing_trace = false,
.clock_trace = true,
.disable_pplib_clock_request = true,
- .pipe_split_policy = MPC_SPLIT_DYNAMIC,
+ .pipe_split_policy = MPC_SPLIT_AVOID_MULT_DISP,
.force_single_disp_pipe_split = false,
.disable_dcc = DCC_ENABLE,
.vsr_support = true,
--
2.41.0
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.4/drm-amd-display-remove-v_startup-workaround-for-dcn3.patch
queue-6.4/drm-amdgpu-unmap-and-remove-csa_va-properly.patch
queue-6.4/drm-amd-display-update-dtbclk-for-dcn32.patch
queue-6.4/drm-amdgpu-install-stub-fence-into-potential-unused-.patch
queue-6.4/drm-amd-flush-any-delayed-gfxoff-on-suspend-entry.patch
queue-6.4/drm-amdgpu-fix-potential-fence-use-after-free-v2.patch
queue-6.4/revert-drm-amd-display-disable-subvp-drr-to-prevent-.patch
queue-6.4/drm-amd-display-apply-60us-prefetch-for-dcfclk-300mh.patch
queue-6.4/revert-revert-drm-amdgpu-display-change-pipe-policy-for-dcn-2.0.patch
queue-6.4/drm-amdgpu-pm-fix-throttle_status-for-other-than-mp1-11.0.7.patch
queue-6.4/drm-amdgpu-fix-calltrace-warning-in-amddrm_buddy_fin.patch
queue-6.4/drm-amdgpu-fix-memory-leak-in-mes-self-test.patch
queue-6.4/drm-amdgpu-skip-fence-gfx-interrupts-disable-enable-for-s0ix.patch
queue-6.4/drm-amd-display-skip-dpp-dto-update-if-root-clock-is.patch
queue-6.4/drm-amdgpu-fix-integer-overflow-in-amdgpu_cs_pass1.patch
queue-6.4/drm-amd-display-enable-dcn314-dpp-rco.patch
