diff options
| author | Hawking Zhang <Hawking.Zhang@amd.com> | 2019-09-17 23:05:34 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-10-03 17:10:59 +0300 |
| commit | 2011eaea214a985938d0708b4c8daabfd5086b7c (patch) | |
| tree | 035f1e80924f79beaa514d155cee6d59a62402da /drivers/gpu/drm/amd/amdgpu/soc15.c | |
| parent | c7c5be3c892fd33b9c9ff1d4a5570b85e6deec0b (diff) | |
| download | linux-2011eaea214a985938d0708b4c8daabfd5086b7c.tar.xz | |
drm/amdgpu: add psp ip block for arct
enable psp block for firmware loading and other security
feature setup.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/soc15.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index ff3959cdb471..588187615a2b 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -756,6 +756,8 @@ 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 (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) + amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block); if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block); |