diff options
author | Xiangliang Yu <Xiangliang.Yu@amd.com> | 2017-03-28 19:16:42 +0800 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-03-29 23:55:55 -0400 |
commit | c6f3e7cb13bb9e9b1760f0dda37b96a6d1c6ef28 (patch) | |
tree | 6b26fc2d466fc9faa9c3c3eaed55a6a67181b35f /drivers/gpu/drm/amd | |
parent | cfd8373320565fbe83d936e616811bb195b3bc52 (diff) | |
download | op-kernel-dev-c6f3e7cb13bb9e9b1760f0dda37b96a6d1c6ef28.zip op-kernel-dev-c6f3e7cb13bb9e9b1760f0dda37b96a6d1c6ef28.tar.gz |
drm/amdgpu/soc15: enable psp block for SRIOV
SRIOV can support for loading ucode with PSP block, enable it.
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index b5426fc..1671d18 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -494,10 +494,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) amdgpu_ip_block_add(adev, &mmhub_v1_0_ip_block); amdgpu_ip_block_add(adev, &gmc_v9_0_ip_block); amdgpu_ip_block_add(adev, &vega10_ih_ip_block); - if (!amdgpu_sriov_vf(adev)) { - amdgpu_ip_block_add(adev, &psp_v3_1_ip_block); + amdgpu_ip_block_add(adev, &psp_v3_1_ip_block); + if (!amdgpu_sriov_vf(adev)) amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block); - } if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) amdgpu_ip_block_add(adev, &dce_virtual_ip_block); amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); |