aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGravatar Gabe Teeger <gabe.teeger@amd.com> 2024-04-09 10:38:58 -0400
committerGravatar Alex Deucher <alexander.deucher@amd.com> 2024-04-30 21:35:15 -0400
commit9a35d205f466501dcfe5625ca313d944d0ac2d60 (patch)
tree662f46378270cd998f5d883d91b04bc1bcc9ed5d /drivers
parentdrm/amd/display: Add dtbclk access to dcn315 (diff)
downloadlinux-9a35d205f466501dcfe5625ca313d944d0ac2d60.tar.gz
linux-9a35d205f466501dcfe5625ca313d944d0ac2d60.tar.bz2
linux-9a35d205f466501dcfe5625ca313d944d0ac2d60.zip
drm/amd/display: Atom Integrated System Info v2_2 for DCN35
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c1
1 files changed, 1 insertions, 0 deletions
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 05f392501c0a..ab31643b1096 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: