aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2151-drm-amdgpu-parse-the-new-members-added-by-gpu_info-u.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2151-drm-amdgpu-parse-the-new-members-added-by-gpu_info-u.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2151-drm-amdgpu-parse-the-new-members-added-by-gpu_info-u.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2151-drm-amdgpu-parse-the-new-members-added-by-gpu_info-u.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2151-drm-amdgpu-parse-the-new-members-added-by-gpu_info-u.patch
new file mode 100644
index 00000000..b987531f
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2151-drm-amdgpu-parse-the-new-members-added-by-gpu_info-u.patch
@@ -0,0 +1,36 @@
+From 690645455ff3fae7cfc2495aec9fd598512cde52 Mon Sep 17 00:00:00 2001
+From: Hawking Zhang <Hawking.Zhang@amd.com>
+Date: Wed, 13 Jun 2018 12:19:43 +0800
+Subject: [PATCH 2151/2940] drm/amdgpu: parse the new members added by gpu_info
+ ucode v1_1
+
+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>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index adb4471499d9..995f31b12a46 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -1428,6 +1428,15 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
+ adev->gfx.cu_info.max_scratch_slots_per_cu =
+ le32_to_cpu(gpu_info_fw->gc_max_scratch_slots_per_cu);
+ adev->gfx.cu_info.lds_size = le32_to_cpu(gpu_info_fw->gc_lds_size);
++ if (hdr->version_minor == 1) {
++ const struct gpu_info_firmware_v1_1 *gpu_info_fw =
++ (const struct gpu_info_firmware_v1_1 *)(adev->firmware.gpu_info_fw->data +
++ le32_to_cpu(hdr->header.ucode_array_offset_bytes));
++ adev->gfx.config.num_sc_per_sh =
++ le32_to_cpu(gpu_info_fw->num_sc_per_sh);
++ adev->gfx.config.num_packer_per_sc =
++ le32_to_cpu(gpu_info_fw->num_packer_per_sc);
++ }
+ break;
+ }
+ default:
+--
+2.17.1
+