From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Mar 2024 10:53:17 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: v4.19.309~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a906b1013c62f2e10738a321f6ea1c8635cac2b3;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	drm-amd-display-increase-frame-warning-limit-with-kasan-or-kcsan-in-dml.patch
---

diff --git a/queue-6.1/drm-amd-display-increase-frame-warning-limit-with-kasan-or-kcsan-in-dml.patch b/queue-6.1/drm-amd-display-increase-frame-warning-limit-with-kasan-or-kcsan-in-dml.patch
new file mode 100644
index 00000000000..aff9d8d52e7
--- /dev/null
+++ b/queue-6.1/drm-amd-display-increase-frame-warning-limit-with-kasan-or-kcsan-in-dml.patch
@@ -0,0 +1,42 @@
+From 5b750b22530fe53bf7fd6a30baacd53ada26911b Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 30 Nov 2023 17:34:07 -0500
+Subject: drm/amd/display: Increase frame warning limit with KASAN or KCSAN in dml
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 5b750b22530fe53bf7fd6a30baacd53ada26911b upstream.
+
+Does the same thing as:
+commit 6740ec97bcdb ("drm/amd/display: Increase frame warning limit with KASAN or KCSAN in dml2")
+
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202311302107.hUDXVyWT-lkp@intel.com/
+Fixes: 67e38874b85b ("drm/amd/display: Increase num voltage states to 40")
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: Alvin Lee <alvin.lee2@amd.com>
+Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
+Cc: Samson Tam <samson.tam@amd.com>
+Cc: Harry Wentland <harry.wentland@amd.com>
+Cc: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/dc/dml/Makefile |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/gpu/drm/amd/display/dc/dml/Makefile
++++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile
+@@ -51,8 +51,12 @@ endif
+ endif
+ 
+ ifneq ($(CONFIG_FRAME_WARN),0)
++ifeq ($(filter y,$(CONFIG_KASAN)$(CONFIG_KCSAN)),y)
++frame_warn_flag := -Wframe-larger-than=3072
++else
+ frame_warn_flag := -Wframe-larger-than=2048
+ endif
++endif
+ 
+ CFLAGS_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_ccflags)
+ 
diff --git a/queue-6.1/series b/queue-6.1/series
index daa18aaf2aa..efecf691008 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -139,3 +139,4 @@ x86-decompressor-pass-pgtable-address-to-trampoline-directly.patch
 x86-decompressor-merge-trampoline-cleanup-with-switching-code.patch
 x86-decompressor-move-global-symbol-references-to-c-code.patch
 decompress-use-8-byte-alignment.patch
+drm-amd-display-increase-frame-warning-limit-with-kasan-or-kcsan-in-dml.patch