From 7922bacf70d05f409c51acb0e68a858caeca315f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mar 19 2024 10:47:13 +0000 Subject: Revert "Revert "drm/amdgpu/display: change pipe policy for DCN 2.0"" (git-fixes). --- diff --git a/patches.suse/Revert-Revert-drm-amdgpu-display-change-pipe-policy-.patch b/patches.suse/Revert-Revert-drm-amdgpu-display-change-pipe-policy-.patch new file mode 100644 index 0000000..bb82236 --- /dev/null +++ b/patches.suse/Revert-Revert-drm-amdgpu-display-change-pipe-policy-.patch @@ -0,0 +1,42 @@ +From 6ecc10295abb2fdd9c21dd17b34e4cacfd829cd4 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 15 Aug 2023 17:25:37 -0400 +Subject: [PATCH] Revert "Revert "drm/amdgpu/display: change pipe policy for DCN 2.0"" +Git-commit: 6ecc10295abb2fdd9c21dd17b34e4cacfd829cd4 +Alt-commit: ef35c7ba60410926d0501e45aad299656a83826c +Patch-mainline: v6.5-rc7 +References: git-fixes + +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 +Reviewed-by: Harry Wentland +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org # 6.4.x +Acked-by: Takashi Iwai + +--- + 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.43.0 + diff --git a/series.conf b/series.conf index 86767a4..4b94b16 100644 --- a/series.conf +++ b/series.conf @@ -43298,6 +43298,7 @@ patches.suse/drm-amdgpu-pm-fix-throttle_status-for-other-than-MP1.patch patches.suse/drm-amdgpu-skip-fence-GFX-interrupts-disable-enable-.patch patches.suse/drm-amd-flush-any-delayed-gfxoff-on-suspend-entry.patch + patches.suse/Revert-Revert-drm-amdgpu-display-change-pipe-policy-.patch patches.suse/drm-qxl-fix-UAF-on-handle-creation.patch patches.suse/virtio-net-set-queues-after-driver_ok.patch patches.suse/net-phy-fix-IRQ-based-wake-on-lan-over-hibernate-pow.patch