This is a note to let you know that I've just added the patch titled
drm/amd/display: Increase frame warning limit with KASAN or KCSAN in dml
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-increase-frame-warning-limit-with-kasan-or-kcsan-in-dml.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5b750b22530fe53bf7fd6a30baacd53ada26911b Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
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@xxxxxxx>
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@xxxxxxx>
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202311302107.hUDXVyWT-lkp@xxxxxxxxx/
Fixes: 67e38874b85b ("drm/amd/display: Increase num voltage states to 40")
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: Alvin Lee <alvin.lee2@xxxxxxx>
Cc: Hamza Mahfooz <hamza.mahfooz@xxxxxxx>
Cc: Samson Tam <samson.tam@xxxxxxx>
Cc: Harry Wentland <harry.wentland@xxxxxxx>
Cc: Nathan Chancellor <nathan@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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)
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.1/revert-drm-amd-pm-resolve-reboot-exception-for-si-oland.patch
queue-6.1/drm-amd-display-increase-frame-warning-limit-with-kasan-or-kcsan-in-dml.patch
