From: Xiangliang Yu Date: Tue, 28 Mar 2017 11:16:42 +0000 (+0800) Subject: drm/amdgpu/soc15: enable psp block for SRIOV X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c6f3e7cb13bb9e9b1760f0dda37b96a6d1c6ef28;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/amdgpu/soc15: enable psp block for SRIOV SRIOV can support for loading ucode with PSP block, enable it. Signed-off-by: Xiangliang Yu Acked-by: Huang Rui Acked-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index b5426fc2ee28..1671d18a9605 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);