Skip to content

Commit 694c797

Browse files
Aurabindo Pillaialexdeucher
authored andcommitted
drm/amd/display: parse umc_info or vram_info based on ASIC
An upstream bug report suggests that there are production dGPUs that are older than DCN401 but still have a umc_info in VBIOS tables with the same version as expected for a DCN401 product. Hence, reading this tables should be guarded with a version check. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3678 Reviewed-by: Dillon Varone <[email protected]> Signed-off-by: Aurabindo Pillai <[email protected]> Signed-off-by: Zaeem Mohamed <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit 2551b4a) Fixes: 00c3911 ("drm/amd/display: Add misc DC changes for DCN401") Cc: [email protected] # 6.11.x
1 parent 4f26c95 commit 694c797

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3127,7 +3127,9 @@ static enum bp_result bios_parser_get_vram_info(
31273127
struct atom_data_revision revision;
31283128

31293129
// vram info moved to umc_info for DCN4x
3130-
if (info && DATA_TABLES(umc_info)) {
3130+
if (dcb->ctx->dce_version >= DCN_VERSION_4_01 &&
3131+
dcb->ctx->dce_version < DCN_VERSION_MAX &&
3132+
info && DATA_TABLES(umc_info)) {
31313133
header = GET_IMAGE(struct atom_common_table_header,
31323134
DATA_TABLES(umc_info));
31333135

0 commit comments

Comments
 (0)