diff options
| -rw-r--r-- | SOURCES/dcn32-dcn301-dcn321-mpo-reverts.patch | 105 | ||||
| -rw-r--r-- | SPECS/kernel.spec | 7 |
2 files changed, 111 insertions, 1 deletions
diff --git a/SOURCES/dcn32-dcn301-dcn321-mpo-reverts.patch b/SOURCES/dcn32-dcn301-dcn321-mpo-reverts.patch new file mode 100644 index 0000000..0899cdb --- /dev/null +++ b/SOURCES/dcn32-dcn301-dcn321-mpo-reverts.patch @@ -0,0 +1,105 @@ +From abfb30be0bebf7a56e38fabe6ed8affcb2cbabf4 Mon Sep 17 00:00:00 2001 +From: Matthew Schwartz <mattschwartz@gwu.edu> +Date: Thu, 1 Aug 2024 19:05:58 -0700 +Subject: [PATCH 0/2] drm/amd/display: Collection of DCN reverts for Vangogh/7900XTX + +Seems like the entire MPO/MPC pipeline is borked in gamescope-session, +causing artifacts when the pipeline splits for overlay planes + +For now, let's just revert these ourselves while AMD investigates. + +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠔⢠⣄⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡠⠄⠂⠉⢀⣀⠀⠀⠉⡀ +⠀⠀⠀⠀⠀⠀⢀⠀⠤⠀⠒⠀⠉⠀⠀⠀⠀⠀⡻⠋⢱⠀⠀⠇ +⠀⠀⡀⢀⠔⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⠒⠁⢀⠞⠀ +⢸⠁⠀⡎⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠄⠀⠀⢀⠴⠃⠀⠀ +⠈⠑⠦⠀⠀⠀⠀⠀⠤⢀⠀⠀⠀⠀⡠⠂⠀⢀⠖⠁⠀⠀⠀⠀ +⢀⠤⠒⠈⠉⠉⠀⠒⠂⠠⠌⠢⣀⣰⠀⠀⠀⡊⠀⢀⣀⡀⠀⠀ +⠣⡀⠀⢀⡀⠀⠀⠀⠀⠀⠀⢀⣸⠝⣤⡀⠀⠀⠉⠀⠈⣧⠒⣢ +⠀⠈⠒⠤⠬⣉⣀⠀⠀⠀⠉⢀⣙⠛⠾⡀⠉⠐⠒⠀⠐⠛⠂⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠉⠑⠢⢌⣀⠉⠐⠚⠀⠀⠀⠀⠀⠀⠀⠀ + + +Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3441 +Signed-off-by: Matthew Schwartz <mattschwartz@gwu.edu> + +Matthew Schwartz (2): + Revert "drm/amd/display: Set MPC_SPLIT_DYNAMIC for DCN301" + Revert "drm/amd/display: reenable windowed mpo odm support on dcn32 + and dcn321" + + .../gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 1 - + .../gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +-- +2.45.2 + +From 113462faa9fb383df2c11638f1c90656a054b2c8 Mon Sep 17 00:00:00 2001 +From: Matthew Schwartz <mattschwartz@gwu.edu> +Date: Thu, 1 Aug 2024 19:03:53 -0700 +Subject: [PATCH 1/2] Revert "drm/amd/display: Set MPC_SPLIT_DYNAMIC for + DCN301" + +This reverts commit 75b204ee6cac4595cc663daf59b40162bbf411fb. +--- + .../gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c +index 7d04739c3ba1..a6193d4d00fa 100644 +--- a/drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c +@@ -689,7 +689,7 @@ static const struct dc_debug_options debug_defaults_drv = { + .disable_clock_gate = true, + .disable_pplib_clock_request = true, + .disable_pplib_wm_range = true, +- .pipe_split_policy = MPC_SPLIT_DYNAMIC, ++ .pipe_split_policy = MPC_SPLIT_AVOID, + .force_single_disp_pipe_split = false, + .disable_dcc = DCC_ENABLE, + .vsr_support = true, +-- +2.45.2 + +From abfb30be0bebf7a56e38fabe6ed8affcb2cbabf4 Mon Sep 17 00:00:00 2001 +From: Matthew Schwartz <mattschwartz@gwu.edu> +Date: Thu, 1 Aug 2024 19:04:26 -0700 +Subject: [PATCH 2/2] Revert "drm/amd/display: reenable windowed mpo odm + support on dcn32 and dcn321" + +This reverts commit 34241dc665cf21bc628f1fea2249adb10010dfc0. +--- + drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c | 1 - + .../gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +index 969658313fd6..934e5a3ac6bc 100644 +--- a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +@@ -2219,7 +2219,6 @@ static bool dcn32_resource_construct( + dc->config.use_pipe_ctx_sync_logic = true; + + dc->config.dc_mode_clk_limit_support = true; +- dc->config.enable_windowed_mpo_odm = true; + /* read VBIOS LTTPR caps */ + { + if (ctx->dc_bios->funcs->get_lttpr_caps) { +diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c +index 9a3cc0514a36..adde6c7b09f6 100644 +--- a/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c +@@ -1779,7 +1779,7 @@ static bool dcn321_resource_construct( + dc->caps.color.mpc.ocsc = 1; + + dc->config.dc_mode_clk_limit_support = true; +- dc->config.enable_windowed_mpo_odm = true; ++ dc->config.enable_windowed_mpo_odm = false; + /* read VBIOS LTTPR caps */ + { + if (ctx->dc_bios->funcs->get_lttpr_caps) { +-- +2.45.2 + diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 83c1a03..7968303 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -169,7 +169,7 @@ Summary: The Linux kernel # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 202%{?buildid}%{?dist} +%define specrelease 203%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.12 @@ -1048,6 +1048,7 @@ Patch414: 0001-add-revoke_all-ioctl-to-release-event-and-joy-nodes-.patch Patch415: v0-speaker-multifix.patch Patch416: v0-oxp-sensors.patch Patch417: loki-mini-pro-hda-pin-fixes.patch +Patch418: dcn32-dcn301-dcn321-mpo-reverts.patch # Allow to set custom USB pollrate for specific devices like so: # usbcore.interrupt_interval_override=045e:00db:16,1bcf:0005:1 @@ -1953,6 +1954,7 @@ ApplyOptionalPatch 0001-add-revoke_all-ioctl-to-release-event-and-joy-nodes-.pat ApplyOptionalPatch v0-speaker-multifix.patch ApplyOptionalPatch v0-oxp-sensors.patch ApplyOptionalPatch loki-mini-pro-hda-pin-fixes.patch +ApplyOptionalPatch dcn32-dcn301-dcn321-mpo-reverts.patch # Allow to set custom USB pollrate for specific devices like so: # usbcore.interrupt_interval_override=045e:00db:16,1bcf:0005:1 @@ -4133,6 +4135,9 @@ fi\ # # %changelog +* Sat Aug 03 2024 Jan200101 <sentrycraft123@gmail.com> - 6.9.12-203.fsync +- kernel-fsync v6.9.12 work around DCN issue + * Wed Jul 31 2024 Jan200101 <sentrycraft123@gmail.com> - 6.9.12-202.fsync - kernel v6.9.12 loki mini |