Commit 836dab85 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/atomfirmware: update vram info handling for renoir 



Add support for integrated_system_info table v12.  Use the actual
v12 structure.

Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2fde24e4

drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c

+10 −1
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev) 


union igp_info {

	struct atom_integrated_system_info_v1_11 v11;

	struct atom_integrated_system_info_v1_12 v12;

};



union umc_info {
@@ -206,7 +207,6 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
				(mode_info->atom_context->bios + data_offset);

			switch (crev) {

			case 11:

			case 12:

				mem_channel_number = igp_info->v11.umachannelnumber;

				/* channel width is 64 */

				if (vram_width)
@@ -215,6 +215,15 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
				if (vram_type)

					*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

				break;

			case 12:

				mem_channel_number = igp_info->v12.umachannelnumber;

				/* channel width is 64 */

				if (vram_width)

					*vram_width = mem_channel_number * 64;

				mem_type = igp_info->v12.memorytype;

				if (vram_type)

					*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

				break;

			default:

				return -EINVAL;

			}