Commit 97e27292 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: update ecc query support for arcturus 



arcturus and sienna_cichlid share the same version
of umc_info interface (umc_info v33). arcturus uses
umc_config to indicate ECC capability, while
sienna_cichlid uses umc_config1 to indicate ECC
capability. driver needs to check either umc_config
or umc_config1 to decide ECC capability for ASICs
that use umc_info v33 interface.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarFrank Min <Frank.Min@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 94ae8dc5

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

+10 −6
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ bool amdgpu_atomfirmware_mem_ecc_supported(struct amdgpu_device *adev) 
	union umc_info *umc_info;

	u8 frev, crev;

	bool ecc_default_enabled = false;

	u8 umc_config;

	u32 umc_config1;



	index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,

			umc_info);
@@ -372,19 +374,21 @@ bool amdgpu_atomfirmware_mem_ecc_supported(struct amdgpu_device *adev) 
				(mode_info->atom_context->bios + data_offset);

			switch (crev) {

			case 1:

				umc_config = le32_to_cpu(umc_info->v31.umc_config);

				ecc_default_enabled =

					(le32_to_cpu(umc_info->v31.umc_config) &

					 UMC_CONFIG__DEFAULT_MEM_ECC_ENABLE) ? true : false;

					(umc_config & UMC_CONFIG__DEFAULT_MEM_ECC_ENABLE) ? true : false;

				break;

			case 2:

				umc_config = le32_to_cpu(umc_info->v32.umc_config);

				ecc_default_enabled =

					(le32_to_cpu(umc_info->v32.umc_config) &

					 UMC_CONFIG__DEFAULT_MEM_ECC_ENABLE) ? true : false;

					(umc_config & UMC_CONFIG__DEFAULT_MEM_ECC_ENABLE) ? true : false;

				break;

			case 3:

				umc_config = le32_to_cpu(umc_info->v33.umc_config);

				umc_config1 = le32_to_cpu(umc_info->v33.umc_config1);

				ecc_default_enabled =

					(le32_to_cpu(umc_info->v33.umc_config1) &

					 UMC_CONFIG1__ENABLE_ECC_CAPABLE) ? true : false;

					((umc_config & UMC_CONFIG__DEFAULT_MEM_ECC_ENABLE) ||

					 (umc_config1 & UMC_CONFIG1__ENABLE_ECC_CAPABLE)) ? true : false;

				break;

			default:

				/* unsupported crev */