From: Sasha Levin <sashal@kernel.org>
Date: Sat, 11 May 2024 23:37:39 +0000 (-0400)
Subject: Fixes for 6.8
X-Git-Tag: v4.19.314~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0a48d62f974a389ab333aab15fbed9b7a61b5c7;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 6.8

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

diff --git a/queue-6.8/drm-amd-display-atom-integrated-system-info-v2_2-for.patch b/queue-6.8/drm-amd-display-atom-integrated-system-info-v2_2-for.patch
new file mode 100644
index 00000000000..7e54bd79e15
--- /dev/null
+++ b/queue-6.8/drm-amd-display-atom-integrated-system-info-v2_2-for.patch
@@ -0,0 +1,42 @@
+From 559e61ae23dd17140fd26127b6d26d55adbf3f41 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 05f392501c0ae..ab31643b10969 100644
+--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
++++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+@@ -2948,6 +2948,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.8/series b/queue-6.8/series
index a63e58fc295..485566f6c2d 100644
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -238,3 +238,4 @@ drm-connector-add-n-to-message-about-demoting-connec.patch
 dm-amd-pm-fix-problems-with-reboot-shutdown-for-some.patch
 gpiolib-cdev-fix-use-after-free-in-lineinfo_changed_.patch
 gpiolib-cdev-fix-uninitialised-kfifo.patch
+drm-amd-display-atom-integrated-system-info-v2_2-for.patch