drm/amd/display: Revert " drm/amd/display: Use channel_width = 2 for vram table 3.0"

[Description]
Revert commit fec05adc40c2 ("drm/amd/display: Use channel_width = 2 for vram table 3.0")
Because the issue is being fixed from VBIOS side.

Reviewed-by: Samson Tam <[email protected]>
Acked-by: Wayne Lin <[email protected]>
Signed-off-by: Alvin Lee <[email protected]>
Tested-by: Daniel Wheeler <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

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 875a064bb9a5c05de973a558d8408dca0774b9b7..fcd65a2057ad4722257d23dcdfa9b030a09ccd16 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
@@ -2386,13 +2386,7 @@ static enum bp_result get_vram_info_v30(
                return BP_RESULT_BADBIOSTABLE;
 
        info->num_chans = info_v30->channel_num;
-       /* As suggested by VBIOS we should always use
-        * dram_channel_width_bytes = 2 when using VRAM
-        * table version 3.0. This is because the channel_width
-        * param in the VRAM info table is changed in 7000 series and
-        * no longer represents the memory channel width.
-        */
-       info->dram_channel_width_bytes = 2;
+       info->dram_channel_width_bytes = (1 << info_v30->channel_width) / 8;
 
        return result;
 }