Fixes for 6.1

Signed-off-by: Sasha Levin <sashal@kernel.org>

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 (file)
index 0000000..bcfd40e
--- /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 <sashal@kernel.org>
+Date: Tue, 9 Apr 2024 10:38:58 -0400
+Subject: drm/amd/display: Atom Integrated System Info v2_2 for DCN35
+
+From: Gabe Teeger <gabe.teeger@amd.com>
+
+[ 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 <nicholas.kazlauskas@amd.com>
+Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
+Signed-off-by: Gabe Teeger <gabe.teeger@amd.com>
+Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ 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 (file)
index 0000000..feb6a95
--- /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 <sashal@kernel.org>
+Date: Thu, 9 May 2024 13:17:35 -0700
+Subject: MAINTAINERS: add leah to 6.1 MAINTAINERS file
+
+From: Leah Rumancik <leah.rumancik@gmail.com>
+
+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 <leah.rumancik@gmail.com>
+Reviewed-by: Darrick J. Wong <djwong@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ 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 <leah.rumancik@gmail.com>
+ M:    Darrick J. Wong <djwong@kernel.org>
+ L:    linux-xfs@vger.kernel.org
+ S:    Supported
+-- 
+2.43.0
+

diff --git a/queue-6.1/series b/queue-6.1/series
index 23ff0ba4fc3b4469dd72a1e7ebf2f65696c6cca9..b7cecd30b7d0549c52ad52cc3c9b9f2bf3314cb7 100644 (file)
--- 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