Skip to content

L
linux
Commit 7089dd3c authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files
Options

drm/amdgpu: support query vram_info v3_0 

vram_info table provides various vram information
including vram_vendor, vram_type, vram_width, etc.

v2: correct the calculation of vram_width
Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarLikun Gao <Likun.Gao@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1a482448
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 80 deletions
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
View file @ 7089dd3c
...@@ -162,12 +162,14 @@ union vram_info { ...@@ -162,12 +162,14 @@ union vram_info {
struct atom_vram_info_header_v2_4 v24; struct atom_vram_info_header_v2_4 v24;
struct atom_vram_info_header_v2_5 v25; struct atom_vram_info_header_v2_5 v25;
struct atom_vram_info_header_v2_6 v26; struct atom_vram_info_header_v2_6 v26;
struct atom_vram_info_header_v3_0 v30;
}; };
union vram_module { union vram_module {
struct atom_vram_module_v9 v9; struct atom_vram_module_v9 v9;
struct atom_vram_module_v10 v10; struct atom_vram_module_v10 v10;
struct atom_vram_module_v11 v11; struct atom_vram_module_v11 v11;
struct atom_vram_module_v3_0 v30;
}; };
static int convert_atom_mem_type_to_vram_type(struct amdgpu_device *adev, static int convert_atom_mem_type_to_vram_type(struct amdgpu_device *adev,
...@@ -294,88 +296,116 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, ...@@ -294,88 +296,116 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
vram_info = (union vram_info *) vram_info = (union vram_info *)
(mode_info->atom_context->bios + data_offset); (mode_info->atom_context->bios + data_offset);
module_id = (RREG32(adev->bios_scratch_reg_offset + 4) & 0x00ff0000) >> 16; module_id = (RREG32(adev->bios_scratch_reg_offset + 4) & 0x00ff0000) >> 16;
switch (crev) { if (frev == 3) {
case 3: switch (crev) {
if (module_id > vram_info->v23.vram_module_num) /* v30 */
module_id = 0; case 0:
vram_module = (union vram_module *)vram_info->v23.vram_module; vram_module = (union vram_module *)vram_info->v30.vram_module;
while (i < module_id) { mem_vendor = (vram_module->v30.dram_vendor_id) & 0xF;
vram_module = (union vram_module *) if (vram_vendor)
((u8 *)vram_module + vram_module->v9.vram_module_size); *vram_vendor = mem_vendor;
i++; mem_type = vram_info->v30.memory_type;
} if (vram_type)
mem_type = vram_module->v9.memory_type; *vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
if (vram_type) mem_channel_number = vram_info->v30.channel_num;
*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type); mem_channel_width = vram_info->v30.channel_width;
mem_channel_number = vram_module->v9.channel_num; if (vram_width)
mem_channel_width = vram_module->v9.channel_width; *vram_width = mem_channel_number * mem_channel_width;
if (vram_width) break;
*vram_width = mem_channel_number * (1 << mem_channel_width); default:
mem_vendor = (vram_module->v9.vender_rev_id) & 0xF; return -EINVAL;
if (vram_vendor)
*vram_vendor = mem_vendor;
break;
case 4:
if (module_id > vram_info->v24.vram_module_num)
module_id = 0;
vram_module = (union vram_module *)vram_info->v24.vram_module;
while (i < module_id) {
vram_module = (union vram_module *)
((u8 *)vram_module + vram_module->v10.vram_module_size);
i++;
}
mem_type = vram_module->v10.memory_type;
if (vram_type)
*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
mem_channel_number = vram_module->v10.channel_num;
mem_channel_width = vram_module->v10.channel_width;
if (vram_width)
*vram_width = mem_channel_number * (1 << mem_channel_width);
mem_vendor = (vram_module->v10.vender_rev_id) & 0xF;
if (vram_vendor)
*vram_vendor = mem_vendor;
break;
case 5:
if (module_id > vram_info->v25.vram_module_num)
module_id = 0;
vram_module = (union vram_module *)vram_info->v25.vram_module;
while (i < module_id) {
vram_module = (union vram_module *)
((u8 *)vram_module + vram_module->v11.vram_module_size);
i++;
} }
mem_type = vram_module->v11.memory_type; } else if (frev == 2) {
if (vram_type) switch (crev) {
*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type); /* v23 */
mem_channel_number = vram_module->v11.channel_num; case 3:
mem_channel_width = vram_module->v11.channel_width; if (module_id > vram_info->v23.vram_module_num)
if (vram_width) module_id = 0;
*vram_width = mem_channel_number * (1 << mem_channel_width); vram_module = (union vram_module *)vram_info->v23.vram_module;
mem_vendor = (vram_module->v11.vender_rev_id) & 0xF; while (i < module_id) {
if (vram_vendor) vram_module = (union vram_module *)
*vram_vendor = mem_vendor; ((u8 *)vram_module + vram_module->v9.vram_module_size);
break; i++;
case 6: }
if (module_id > vram_info->v26.vram_module_num) mem_type = vram_module->v9.memory_type;
module_id = 0; if (vram_type)
vram_module = (union vram_module *)vram_info->v26.vram_module; *vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
while (i < module_id) { mem_channel_number = vram_module->v9.channel_num;
vram_module = (union vram_module *) mem_channel_width = vram_module->v9.channel_width;
((u8 *)vram_module + vram_module->v9.vram_module_size); if (vram_width)
i++; *vram_width = mem_channel_number * (1 << mem_channel_width);
mem_vendor = (vram_module->v9.vender_rev_id) & 0xF;
if (vram_vendor)
*vram_vendor = mem_vendor;
break;
/* v24 */
case 4:
if (module_id > vram_info->v24.vram_module_num)
module_id = 0;
vram_module = (union vram_module *)vram_info->v24.vram_module;
while (i < module_id) {
vram_module = (union vram_module *)
((u8 *)vram_module + vram_module->v10.vram_module_size);
i++;
}
mem_type = vram_module->v10.memory_type;
if (vram_type)
*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
mem_channel_number = vram_module->v10.channel_num;
mem_channel_width = vram_module->v10.channel_width;
if (vram_width)
*vram_width = mem_channel_number * (1 << mem_channel_width);
mem_vendor = (vram_module->v10.vender_rev_id) & 0xF;
if (vram_vendor)
*vram_vendor = mem_vendor;
break;
/* v25 */
case 5:
if (module_id > vram_info->v25.vram_module_num)
module_id = 0;
vram_module = (union vram_module *)vram_info->v25.vram_module;
while (i < module_id) {
vram_module = (union vram_module *)
((u8 *)vram_module + vram_module->v11.vram_module_size);
i++;
}
mem_type = vram_module->v11.memory_type;
if (vram_type)
*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
mem_channel_number = vram_module->v11.channel_num;
mem_channel_width = vram_module->v11.channel_width;
if (vram_width)
*vram_width = mem_channel_number * (1 << mem_channel_width);
mem_vendor = (vram_module->v11.vender_rev_id) & 0xF;
if (vram_vendor)
*vram_vendor = mem_vendor;
break;
/* v26 */
case 6:
if (module_id > vram_info->v26.vram_module_num)
module_id = 0;
vram_module = (union vram_module *)vram_info->v26.vram_module;
while (i < module_id) {
vram_module = (union vram_module *)
((u8 *)vram_module + vram_module->v9.vram_module_size);
i++;
}
mem_type = vram_module->v9.memory_type;
if (vram_type)
*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
mem_channel_number = vram_module->v9.channel_num;
mem_channel_width = vram_module->v9.channel_width;
if (vram_width)
*vram_width = mem_channel_number * (1 << mem_channel_width);
mem_vendor = (vram_module->v9.vender_rev_id) & 0xF;
if (vram_vendor)
*vram_vendor = mem_vendor;
break;
default:
return -EINVAL;
} }
mem_type = vram_module->v9.memory_type; } else {
if (vram_type) /* invalid frev */
*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
mem_channel_number = vram_module->v9.channel_num;
mem_channel_width = vram_module->v9.channel_width;
if (vram_width)
*vram_width = mem_channel_number * (1 << mem_channel_width);
mem_vendor = (vram_module->v9.vender_rev_id) & 0xF;
if (vram_vendor)
*vram_vendor = mem_vendor;
break;
default:
return -EINVAL; return -EINVAL;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7