6.12-stable patches

added patches:
	drm-amd-display-temporarily-disable-hostvm-on-dcn31.patch
	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 (file)
index 0000000..3872ccb
--- /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 <aurabindo.pillai@amd.com>
+Date: Mon, 20 Jan 2025 15:27:23 -0500
+Subject: drm/amd/display: Temporarily disable hostvm on DCN31
+
+From: Aurabindo Pillai <aurabindo.pillai@amd.com>
+
+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 <sunpeng.li@amd.com>
+Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
+Signed-off-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
+Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 (file)
index 0000000..0ef76b1
--- /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 <wangyuli@uniontech.com>
+Date: Sat, 8 Mar 2025 13:51:32 +0800
+Subject: LoongArch: Eliminate superfluous get_numa_distances_cnt()
+
+From: Yuli Wang <wangyuli@uniontech.com>
+
+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 <wangyuli@uniontech.com>
+Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 7eb646d4866d3f0865797484459afe56e56d6042..845471c7f0c4c0f2739ff4a3ee1d0c1a80164f8f 100644 (file)
--- 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