Revert "drm/amd/display: parse umc_info or vram_info based on ASIC"

commit 3c2296b1eec55b50c64509ba15406142d4a958dc upstream.

This reverts commit 2551b4a321a68134360b860113dd460133e856e5.

This was not the root cause.  Revert.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3678
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: aurabindo.pillai@amd.com
Cc: hamishclaxton@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 902491669cbc7dfce7c7d6714cb9310102952069..c9a6de110b742f198811bc74ef9c584cb5fe1910 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
@@ -3127,9 +3127,7 @@ static enum bp_result bios_parser_get_vram_info(
        struct atom_data_revision revision;
 
        // vram info moved to umc_info for DCN4x
-       if (dcb->ctx->dce_version >= DCN_VERSION_4_01 &&
-               dcb->ctx->dce_version < DCN_VERSION_MAX &&
-               info && DATA_TABLES(umc_info)) {
+       if (info && DATA_TABLES(umc_info)) {
                header = GET_IMAGE(struct atom_common_table_header,
                                        DATA_TABLES(umc_info));