diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3876-drm-amdgpu-discovery-get-gpu-info-from-ip-discovery-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3876-drm-amdgpu-discovery-get-gpu-info-from-ip-discovery-.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3876-drm-amdgpu-discovery-get-gpu-info-from-ip-discovery-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3876-drm-amdgpu-discovery-get-gpu-info-from-ip-discovery-.patch new file mode 100644 index 00000000..baeb5441 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3876-drm-amdgpu-discovery-get-gpu-info-from-ip-discovery-.patch @@ -0,0 +1,56 @@ +From 8a12889f0ce2da6b07c27f117b89a16eb0622dac Mon Sep 17 00:00:00 2001 +From: Xiaojie Yuan <xiaojie.yuan@amd.com> +Date: Wed, 11 Sep 2019 11:41:05 +0800 +Subject: [PATCH 3876/4256] drm/amdgpu/discovery: get gpu info from ip + discovery table + +except soc_bounding_box which is not integrated in discovery table yet + +Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 63ec56c38bd8..6df43bc6dc5e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -1471,6 +1471,9 @@ 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) ++ 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); + adev->gfx.config.max_sh_per_se = le32_to_cpu(gpu_info_fw->gc_num_sh_per_se); +@@ -1498,7 +1501,13 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) + adev->gfx.config.num_packer_per_sc = + le32_to_cpu(gpu_info_fw->num_packer_per_sc); + } ++ ++parse_soc_bounding_box: + #ifdef CONFIG_DRM_AMD_DC_DCN2_0 ++ /* ++ * soc bounding box info is not integrated in disocovery table, ++ * we always need to parse it from gpu info firmware. ++ */ + if (hdr->version_minor == 2) { + const struct gpu_info_firmware_v1_2 *gpu_info_fw = + (const struct gpu_info_firmware_v1_2 *)(adev->firmware.gpu_info_fw->data + +@@ -1615,6 +1624,9 @@ 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)) { +-- +2.17.1 + |