From a4f71c3cad17b38dcc7b5c315e26cac9bb5e38f1 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 11 May 2024 19:37:40 -0400 Subject: [PATCH] Fixes for 6.6 Signed-off-by: Sasha Levin --- ...atom-integrated-system-info-v2_2-for.patch | 42 +++++++++++++++++++ queue-6.6/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 queue-6.6/drm-amd-display-atom-integrated-system-info-v2_2-for.patch 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 index 00000000000..9285fd6c7ca --- /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 +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 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 ce34b1cd666..1c95bab9ec8 100644 --- 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 -- 2.47.2