Fixes for 6.6

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

diff --git a/queue-6.6/drm-amd-display-atom-integrated-system-info-v2_2-for.patch b/queue-6.6/drm-amd-display-atom-integrated-system-info-v2_2-for.patch
new file mode 100644 (file)
index 0000000..9285fd6
--- /dev/null
+++ b/queue-6.6/drm-amd-display-atom-integrated-system-info-v2_2-for.patch
@@ -0,0 +1,42 @@
+From 1a54364bb40afad2d247ce6f934ba62fd6e5b38a 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 4c3c4c8de1cfc..93720cf069d7c 100644
+--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
++++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+@@ -2961,6 +2961,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.6/series b/queue-6.6/series
index ce34b1cd666dabb0628652a062faf5a27d9f22a9..1c95bab9ec85eac8f1205eece8e9ef3ff8ec969a 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -217,3 +217,4 @@ dm-amd-pm-fix-problems-with-reboot-shutdown-for-some.patch
 gpiolib-cdev-fix-use-after-free-in-lineinfo_changed_.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