aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3775-drm-amdgpu-use-adev-firmware-to-determine-whether-to.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3775-drm-amdgpu-use-adev-firmware-to-determine-whether-to.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3775-drm-amdgpu-use-adev-firmware-to-determine-whether-to.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3775-drm-amdgpu-use-adev-firmware-to-determine-whether-to.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3775-drm-amdgpu-use-adev-firmware-to-determine-whether-to.patch
new file mode 100644
index 00000000..dee23496
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3775-drm-amdgpu-use-adev-firmware-to-determine-whether-to.patch
@@ -0,0 +1,36 @@
+From 216ee3402b35c420726eaac3b05d70695d1af1c5 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 9 Mar 2018 15:19:44 -0500
+Subject: [PATCH 3775/4131] drm/amdgpu: use adev->firmware to determine whether
+ to load the PSP module
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The per device firmware load method is limited to what makes sense for
+that asic rather than whatever arbitrary value may have been set by the
+user.
+
+Reviewed-by: Rex Zhu <rezhu@amd.com>
+Acked-by: Christian König <christian.koenig@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
+index de7defb..5b2019b7 100644
+--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
+@@ -531,7 +531,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
+ amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
+ amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
+ amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+- if (amdgpu_fw_load_type == 2 || amdgpu_fw_load_type == -1)
++ if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)
+ amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);
+ if (!amdgpu_sriov_vf(adev))
+ amdgpu_device_ip_block_add(adev, &amdgpu_pp_ip_block);
+--
+2.7.4
+