diff options
| author | Hawking Zhang <Hawking.Zhang@amd.com> | 2018-03-08 18:01:24 +0800 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-03-14 14:38:26 -0500 | 
| commit | 1e09b05386f32efbebb798cf0341eca4b424c960 (patch) | |
| tree | 2fa7522e6bc223818e37c36c56515cbc9ced01e7 /drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | |
| parent | bc227cfa444c692fcb0a860c5a9b5f9abb9c2b2b (diff) | |
drm/amdgpu: query vram type from atombios
The vram type for dGPU is stored in umc_info while sys mem type
for APU is stored in integratedsysteminfo
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 95 | 
1 files changed, 91 insertions, 4 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c index ff8efd0f8fd5..a0f48cb9b8f0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c @@ -114,6 +114,9 @@ union igp_info {  	struct atom_integrated_system_info_v1_11 v11;  }; +union umc_info { +	struct atom_umc_info_v3_1 v31; +};  /*   * Return vram width from integrated system info table, if available,   * or 0 if not. @@ -143,6 +146,94 @@ int amdgpu_atomfirmware_get_vram_width(struct amdgpu_device *adev)  	return 0;  } +static int convert_atom_mem_type_to_vram_type (struct amdgpu_device *adev, +					       int atom_mem_type) +{ +	int vram_type; + +	if (adev->flags & AMD_IS_APU) { +		switch (atom_mem_type) { +		case Ddr2MemType: +		case LpDdr2MemType: +			vram_type = AMDGPU_VRAM_TYPE_DDR2; +			break; +		case Ddr3MemType: +		case LpDdr3MemType: +			vram_type = AMDGPU_VRAM_TYPE_DDR3; +			break; +		case Ddr4MemType: +		case LpDdr4MemType: +			vram_type = AMDGPU_VRAM_TYPE_DDR4; +			break; +		default: +			vram_type = AMDGPU_VRAM_TYPE_UNKNOWN; +			break; +		} +	} else { +		switch (atom_mem_type) { +		case ATOM_DGPU_VRAM_TYPE_GDDR5: +			vram_type = AMDGPU_VRAM_TYPE_GDDR5; +			break; +		case ATOM_DGPU_VRAM_TYPE_HBM: +			vram_type = AMDGPU_VRAM_TYPE_HBM; +			break; +		default: +			vram_type = AMDGPU_VRAM_TYPE_UNKNOWN; +			break; +		} +	} + +	return vram_type; +} +/* + * Return vram type from either integrated system info table + * or umc info table, if available, or 0 (TYPE_UNKNOWN) if not + */ +int amdgpu_atomfirmware_get_vram_type(struct amdgpu_device *adev) +{ +	struct amdgpu_mode_info *mode_info = &adev->mode_info; +	int index; +	u16 data_offset, size; +	union igp_info *igp_info; +	union umc_info *umc_info; +	u8 frev, crev; +	u8 mem_type; + +	if (adev->flags & AMD_IS_APU) +		index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1, +						    integratedsysteminfo); +	else +		index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1, +						    umc_info); +	if (amdgpu_atom_parse_data_header(mode_info->atom_context, +					  index, &size, +					  &frev, &crev, &data_offset)) { +		if (adev->flags & AMD_IS_APU) { +			igp_info = (union igp_info *) +				(mode_info->atom_context->bios + data_offset); +			switch (crev) { +			case 11: +				mem_type = igp_info->v11.memorytype; +				return convert_atom_mem_type_to_vram_type(adev, mem_type); +			default: +				return 0; +			} +		} else { +			umc_info = (union umc_info *) +				(mode_info->atom_context->bios + data_offset); +			switch (crev) { +			case 1: +				mem_type = umc_info->v31.vram_type; +				return convert_atom_mem_type_to_vram_type(adev, mem_type); +			default: +				return 0; +			} +		} +	} + +	return 0; +} +  union firmware_info {  	struct atom_firmware_info_v3_1 v31;  }; @@ -151,10 +242,6 @@ union smu_info {  	struct atom_smu_info_v3_1 v31;  }; -union umc_info { -	struct atom_umc_info_v3_1 v31; -}; -  int amdgpu_atomfirmware_get_clock_info(struct amdgpu_device *adev)  {  	struct amdgpu_mode_info *mode_info = &adev->mode_info; | 
