drm/amdgpu: Add umc_info v4_0 structure
Subsystems (2)
PATCH 1/2 drm/amdgpu: Add umc_info v4_0 structure
To be used by aqua_vanjaram
Signed-off-by Hawking Zhang <[email protected]>
Reviewed-by Candice Li <[email protected]>
--- drivers/gpu/drm/amd/include/atomfirmware.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/amd/include/atomfirmware.h +18 -0
@@ -3117,6 +3117,24 @@ enum atom_umc_config1_def { UMC_CONFIG1__ENABLE_ECC_CAPABLE = 0x00010000, }; +struct atom_umc_info_v4_0 { +struct atom_common_table_header table_header; +uint32_t ucode_reserved[5 ]; +uint8_t umcip_min_ver; +uint8_t umcip_max_ver; +uint8_t vram_type; +uint8_t umc_config; +uint32_t mem_refclk_10khz; +uint32_t clk_reserved[4 ]; +uint32_t golden_reserved; +uint32_t umc_config1; +uint32_t reserved[2 ]; +uint8_t channel_num; +uint8_t channel_width; +uint8_t channel_reserve[2 ]; +uint8_t umc_info_reserved[16 ]; +}; +/* *************************************************************************** Data Table vram_info structure
Signature · 1 line
2.17.1
PATCH 2/2 drm/amdgpu: Support query ecc cap for aqua_vanjaram
Driver queries umc_info v4_0 to identify ecc cap
for aqua_vanjaram
Signed-off-by Hawking Zhang <[email protected]>
Reviewed-by Candice Li <[email protected]>
--- .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +16 -2
@@ -217,6 +217,7 @@ union umc_info {struct atom_umc_info_v3_1 v31;struct atom_umc_info_v3_2 v32;struct atom_umc_info_v3_3 v33; +struct atom_umc_info_v4_0 v40; };union vram_info {
@@ -508,9 +509,8 @@ bool amdgpu_atomfirmware_mem_ecc_supported(struct amdgpu_device *adev)if (amdgpu_atom_parse_data_header (mode_info->atom_context, index, &size, &frev, &crev, &data_offset)) { + umc_info = (union umc_info *)(mode_info->atom_context->bios + data_offset);if (frev ==3 ) { - umc_info = (union umc_info *) - (mode_info->atom_context->bios + data_offset);switch (crev) {case 1 : umc_config =le32_to_cpu (umc_info->v31.umc_config);
@@ -533,6 +533,20 @@ bool amdgpu_atomfirmware_mem_ecc_supported(struct amdgpu_device *adev)/* unsupported crev */ return false; } + }else if (frev ==4 ) { +switch (crev) { +case 0 : + umc_config1 =le32_to_cpu (umc_info->v40.umc_config1); + ecc_default_enabled = + (umc_config1 &UMC_CONFIG1__ENABLE_ECC_CAPABLE ) ? true : false; +break ; +default : +/* unsupported crev */ +return false; + } + }else { +/* unsupported frev */ +return false; } }
Signature · 1 line
2.17.1