aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiangliang Yu <Xiangliang.Yu@amd.com>2017-02-28 04:26:40 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:55:55 -0400
commitcfd8373320565fbe83d936e616811bb195b3bc52 (patch)
tree9610f0a903ed65e47ec6ef112948c6a43e911c45
parent6668b734468de12c077ebdf3ed0f9f60d10f9e6a (diff)
drm/amdgpu/soc15: bypass pp block for vf
Disable pp block if device is vf. Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Monk Liu <Monk.Liu@amd.com> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/soc15.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 238fcc3fa78d..b5426fc2ee28 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -494,9 +494,10 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
494 amdgpu_ip_block_add(adev, &mmhub_v1_0_ip_block); 494 amdgpu_ip_block_add(adev, &mmhub_v1_0_ip_block);
495 amdgpu_ip_block_add(adev, &gmc_v9_0_ip_block); 495 amdgpu_ip_block_add(adev, &gmc_v9_0_ip_block);
496 amdgpu_ip_block_add(adev, &vega10_ih_ip_block); 496 amdgpu_ip_block_add(adev, &vega10_ih_ip_block);
497 if (!amdgpu_sriov_vf(adev)) 497 if (!amdgpu_sriov_vf(adev)) {
498 amdgpu_ip_block_add(adev, &psp_v3_1_ip_block); 498 amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
499 amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block); 499 amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
500 }
500 if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) 501 if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
501 amdgpu_ip_block_add(adev, &dce_virtual_ip_block); 502 amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
502 amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); 503 amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block);