From: Xiangliang Yu Date: Wed, 15 Feb 2017 09:25:43 +0000 (+0800) Subject: drm/amdgpu: disable uvd for sriov X-Git-Tag: v4.12-rc1~116^2~23^2~75 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=468842a5e530c5f07bbd0cf790b3f3d6961b722d;p=karo-tx-linux.git drm/amdgpu: disable uvd for sriov disable uvd for sriov temporarily. Signed-off-by: Xiangliang Yu Signed-off-by: Monk Liu Reviewed-by: Alex Deucher Acked-by: Christian König Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 76adb1d69473..6286573ae513 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c @@ -490,7 +490,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) amdgpu_ip_block_add(adev, &dce_virtual_ip_block); amdgpu_ip_block_add(adev, &gfx_v9_0_ip_block); amdgpu_ip_block_add(adev, &sdma_v4_0_ip_block); - amdgpu_ip_block_add(adev, &uvd_v7_0_ip_block); + if (!amdgpu_sriov_vf(adev)) + amdgpu_ip_block_add(adev, &uvd_v7_0_ip_block); amdgpu_ip_block_add(adev, &vce_v4_0_ip_block); break; default: