diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2024-11-08 09:34:46 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-22 15:39:53 +0100 |
| commit | 3067caa93c7e2807416f806cc4ee7a971ef82d01 (patch) | |
| tree | 0b7d92ab3867ee7f54c747f9b44f3d6636686e5c | |
| parent | a4685366f07448420badb710ff5c12aaaadf63ad (diff) | |
| download | linux-stable-3067caa93c7e2807416f806cc4ee7a971ef82d01.tar.gz linux-stable-3067caa93c7e2807416f806cc4ee7a971ef82d01.tar.bz2 linux-stable-3067caa93c7e2807416f806cc4ee7a971ef82d01.zip | |
Revert "drm/amd/display: parse umc_info or vram_info based on ASIC"
commit 5f77ee21eb44e37e371bcea195ea9403b95d1399 upstream.
This reverts commit 694c79769cb384bca8b1ec1d1e84156e726bd106.
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
(cherry picked from commit 3c2296b1eec55b50c64509ba15406142d4a958dc)
Cc: stable@vger.kernel.org # 6.11.x
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 4 |
1 files changed, 1 insertions, 3 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 be8fbb04ad98..0d8498ab9b23 100644 --- 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)); |