Commit 6ba57b7a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: move discovery gfx config fetching 



Move it into the fw_info function since it's logically part
of the same functionality.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 78b7dfd9

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

+3 −4
Original line number Diff line number Diff line
@@ -1617,8 +1617,10 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) 
			(const struct gpu_info_firmware_v1_0 *)(adev->firmware.gpu_info_fw->data +

								le32_to_cpu(hdr->header.ucode_array_offset_bytes));



		if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10)

		if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10) {

			amdgpu_discovery_get_gfx_info(adev);

			goto parse_soc_bounding_box;

		}



		adev->gfx.config.max_shader_engines = le32_to_cpu(gpu_info_fw->gc_num_se);

		adev->gfx.config.max_cu_per_sh = le32_to_cpu(gpu_info_fw->gc_num_cu_per_sh);
@@ -1768,9 +1770,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev) 
	if (r)

		return r;



	if (amdgpu_discovery && adev->asic_type >= CHIP_NAVI10)

		amdgpu_discovery_get_gfx_info(adev);



	amdgpu_amdkfd_device_probe(adev);



	if (amdgpu_sriov_vf(adev)) {