From f59f0bccdceb718af6c1a945c07eb88083802f7e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 22 Apr 2025 10:39:15 +0200 Subject: [PATCH] 6.12-stable patches added patches: drm-amd-display-temporarily-disable-hostvm-on-dcn31.patch loongarch-eliminate-superfluous-get_numa_distances_cnt.patch --- ...-temporarily-disable-hostvm-on-dcn31.patch | 35 ++++++++++++++ ...e-superfluous-get_numa_distances_cnt.patch | 48 +++++++++++++++++++ queue-6.12/series | 2 + 3 files changed, 85 insertions(+) create mode 100644 queue-6.12/drm-amd-display-temporarily-disable-hostvm-on-dcn31.patch create mode 100644 queue-6.12/loongarch-eliminate-superfluous-get_numa_distances_cnt.patch diff --git a/queue-6.12/drm-amd-display-temporarily-disable-hostvm-on-dcn31.patch b/queue-6.12/drm-amd-display-temporarily-disable-hostvm-on-dcn31.patch new file mode 100644 index 0000000000..3872ccbf94 --- /dev/null +++ b/queue-6.12/drm-amd-display-temporarily-disable-hostvm-on-dcn31.patch @@ -0,0 +1,35 @@ +From ba93dddfc92084a1e28ea447ec4f8315f3d8d3fd Mon Sep 17 00:00:00 2001 +From: Aurabindo Pillai +Date: Mon, 20 Jan 2025 15:27:23 -0500 +Subject: drm/amd/display: Temporarily disable hostvm on DCN31 + +From: Aurabindo Pillai + +commit ba93dddfc92084a1e28ea447ec4f8315f3d8d3fd upstream. + +With HostVM enabled, DCN31 fails to pass validation for 3x4k60. Some Linux +userspace does not downgrade one of the monitors to 4k30, and the result +is that the monitor does not light up. Disable it until the bandwidth +calculation failure is resolved. + +Reviewed-by: Sun peng Li +Signed-off-by: Aurabindo Pillai +Signed-off-by: Zaeem Mohamed +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +@@ -891,7 +891,7 @@ static const struct dc_debug_options deb + .disable_z10 = true, + .enable_legacy_fast_update = true, + .enable_z9_disable_interface = true, /* Allow support for the PMFW interface for disable Z9*/ +- .dml_hostvm_override = DML_HOSTVM_NO_OVERRIDE, ++ .dml_hostvm_override = DML_HOSTVM_OVERRIDE_FALSE, + .using_dml2 = false, + }; + diff --git a/queue-6.12/loongarch-eliminate-superfluous-get_numa_distances_cnt.patch b/queue-6.12/loongarch-eliminate-superfluous-get_numa_distances_cnt.patch new file mode 100644 index 0000000000..0ef76b10de --- /dev/null +++ b/queue-6.12/loongarch-eliminate-superfluous-get_numa_distances_cnt.patch @@ -0,0 +1,48 @@ +From a0d3c8bcb9206ac207c7ad3182027c6b0a1319bb Mon Sep 17 00:00:00 2001 +From: Yuli Wang +Date: Sat, 8 Mar 2025 13:51:32 +0800 +Subject: LoongArch: Eliminate superfluous get_numa_distances_cnt() + +From: Yuli Wang + +commit a0d3c8bcb9206ac207c7ad3182027c6b0a1319bb upstream. + +In LoongArch, get_numa_distances_cnt() isn't in use, resulting in a +compiler warning. + +Fix follow errors with clang-18 when W=1e: + +arch/loongarch/kernel/acpi.c:259:28: error: unused function 'get_numa_distances_cnt' [-Werror,-Wunused-function] + 259 | static inline unsigned int get_numa_distances_cnt(struct acpi_table_slit *slit) + | ^~~~~~~~~~~~~~~~~~~~~~ +1 error generated. + +Link: https://lore.kernel.org/all/Z7bHPVUH4lAezk0E@kernel.org/ +Signed-off-by: Yuli Wang +Signed-off-by: Huacai Chen +Signed-off-by: Greg Kroah-Hartman +--- + arch/loongarch/kernel/acpi.c | 12 ------------ + 1 file changed, 12 deletions(-) + +--- a/arch/loongarch/kernel/acpi.c ++++ b/arch/loongarch/kernel/acpi.c +@@ -249,18 +249,6 @@ static __init int setup_node(int pxm) + return acpi_map_pxm_to_node(pxm); + } + +-/* +- * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for +- * I/O localities since SRAT does not list them. I/O localities are +- * not supported at this point. +- */ +-unsigned int numa_distance_cnt; +- +-static inline unsigned int get_numa_distances_cnt(struct acpi_table_slit *slit) +-{ +- return slit->locality_count; +-} +- + void __init numa_set_distance(int from, int to, int distance) + { + if ((u8)distance != distance || (from == to && distance != LOCAL_DISTANCE)) { diff --git a/queue-6.12/series b/queue-6.12/series index 7eb646d486..845471c7f0 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -200,3 +200,5 @@ selftests-bpf-fix-raw_tp-null-handling-test.patch misc-pci_endpoint_test-avoid-issue-of-interrupts-remaining-after-request_irq-error.patch misc-pci_endpoint_test-fix-irq_type-to-convey-the-correct-type.patch efi-libstub-bump-up-efi_mmap_nr_slack_slots-to-32.patch +loongarch-eliminate-superfluous-get_numa_distances_cnt.patch +drm-amd-display-temporarily-disable-hostvm-on-dcn31.patch -- 2.47.3