diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3776-drm-amdgpu-soc15-always-load-the-psp-module.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3776-drm-amdgpu-soc15-always-load-the-psp-module.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3776-drm-amdgpu-soc15-always-load-the-psp-module.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3776-drm-amdgpu-soc15-always-load-the-psp-module.patch new file mode 100644 index 00000000..fdda2e3d --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3776-drm-amdgpu-soc15-always-load-the-psp-module.patch @@ -0,0 +1,37 @@ +From 9e94043c8ee67239099ac209fae939e6c6fb8c3c Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Fri, 9 Mar 2018 15:22:28 -0500 +Subject: [PATCH 3776/4131] drm/amdgpu/soc15: always load the psp module +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Regardless of whether the user has selected psp fw loading or +not. It's still needed for GPU reset among other things. +There are already guards in place to avoid setting up the full +psp if PSP fw loading is not enabled. + +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 | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c +index 5b2019b7..b2cf0be 100644 +--- a/drivers/gpu/drm/amd/amdgpu/soc15.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c +@@ -531,8 +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 (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) +- amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block); ++ 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); + if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) +-- +2.7.4 + |