drm/amdgpu/atomfirmware: fix parsing of vram_info

v3.x changed the how vram width was encoded.  The previous
implementation actually worked correctly for most boards.
Fix the implementation to work correctly everywhere.

This fixes the vram width reported in the kernel log on
some boards.

Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
index f932bec6e5345d0c26bc91ef603953d5e045f49e..f873dd3cae1606a9a7844106adf0adbdcb85a012 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
@@ -433,7 +433,7 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
                                                mem_channel_number = vram_info->v30.channel_num;
                                                mem_channel_width = vram_info->v30.channel_width;
                                                if (vram_width)
-                                                       *vram_width = mem_channel_number * (1 << mem_channel_width);
+                                                       *vram_width = mem_channel_number * 16;
                                                break;
                                        default:
                                                return -EINVAL;