From 7327f78150d0eda60d1de4ea280d4c7cae9908f6 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 11 May 2024 19:37:40 -0400 Subject: [PATCH] Fixes for 6.1 Signed-off-by: Sasha Levin --- ...atom-integrated-system-info-v2_2-for.patch | 42 +++++++++++++++++++ ...ers-add-leah-to-6.1-maintainers-file.patch | 32 ++++++++++++++ queue-6.1/series | 2 + 3 files changed, 76 insertions(+) create mode 100644 queue-6.1/drm-amd-display-atom-integrated-system-info-v2_2-for.patch create mode 100644 queue-6.1/maintainers-add-leah-to-6.1-maintainers-file.patch diff --git a/queue-6.1/drm-amd-display-atom-integrated-system-info-v2_2-for.patch b/queue-6.1/drm-amd-display-atom-integrated-system-info-v2_2-for.patch new file mode 100644 index 00000000000..bcfd40e93a6 --- /dev/null +++ b/queue-6.1/drm-amd-display-atom-integrated-system-info-v2_2-for.patch @@ -0,0 +1,42 @@ +From d85b7cb7a816ee0603fe2666d62c69531188e07b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 9 Apr 2024 10:38:58 -0400 +Subject: drm/amd/display: Atom Integrated System Info v2_2 for DCN35 + +From: Gabe Teeger + +[ Upstream commit 9a35d205f466501dcfe5625ca313d944d0ac2d60 ] + +New request from KMD/VBIOS in order to support new UMA carveout +model. This fixes a null dereference from accessing +Ctx->dc_bios->integrated_info while it was NULL. + +DAL parses through the BIOS and extracts the necessary +integrated_info but was missing a case for the new BIOS +version 2.3. + +Reviewed-by: Nicholas Kazlauskas +Acked-by: Aurabindo Pillai +Signed-off-by: Gabe Teeger +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +index 93e40e0a15087..4d2590964a204 100644 +--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c ++++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +@@ -2962,6 +2962,7 @@ static enum bp_result construct_integrated_info( + result = get_integrated_info_v2_1(bp, info); + break; + case 2: ++ case 3: + result = get_integrated_info_v2_2(bp, info); + break; + default: +-- +2.43.0 + diff --git a/queue-6.1/maintainers-add-leah-to-6.1-maintainers-file.patch b/queue-6.1/maintainers-add-leah-to-6.1-maintainers-file.patch new file mode 100644 index 00000000000..feb6a9557f7 --- /dev/null +++ b/queue-6.1/maintainers-add-leah-to-6.1-maintainers-file.patch @@ -0,0 +1,32 @@ +From 1c53f021a41dc7f24ea21942bf56a76b20d15779 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 9 May 2024 13:17:35 -0700 +Subject: MAINTAINERS: add leah to 6.1 MAINTAINERS file + +From: Leah Rumancik + +I've been trying to get backports rolling to 6.1.y. Update MAINTAINERS +file so backports requests / questions can get routed appropriately. + +Signed-off-by: Leah Rumancik +Reviewed-by: Darrick J. Wong +Signed-off-by: Sasha Levin +--- + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/MAINTAINERS b/MAINTAINERS +index ecf4d0c8f446e..4b19dfb5d2fd4 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -22557,6 +22557,7 @@ F: include/xen/swiotlb-xen.h + + XFS FILESYSTEM + C: irc://irc.oftc.net/xfs ++M: Leah Rumancik + M: Darrick J. Wong + L: linux-xfs@vger.kernel.org + S: Supported +-- +2.43.0 + diff --git a/queue-6.1/series b/queue-6.1/series index 23ff0ba4fc3..b7cecd30b7d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -181,3 +181,5 @@ dm-amd-pm-fix-problems-with-reboot-shutdown-for-some.patch gpiolib-cdev-add-missing-header-s.patch gpiolib-cdev-relocate-debounce_period_us-from-struct.patch gpiolib-cdev-fix-uninitialised-kfifo.patch +drm-amd-display-atom-integrated-system-info-v2_2-for.patch +maintainers-add-leah-to-6.1-maintainers-file.patch -- 2.47.2