summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorXiangliang Yu <Xiangliang.Yu@amd.com>2017-02-15 17:25:43 +0800
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:55:10 -0400
commit468842a5e530c5f07bbd0cf790b3f3d6961b722d (patch)
tree0efc225c63ffdc79b289a0311d0d41422fbb3bb2 /drivers/gpu
parentbae5b5191d0ec7a0f639e612b97ea150e7e089d2 (diff)
downloadlinux-stable-468842a5e530c5f07bbd0cf790b3f3d6961b722d.tar.gz
linux-stable-468842a5e530c5f07bbd0cf790b3f3d6961b722d.tar.bz2
linux-stable-468842a5e530c5f07bbd0cf790b3f3d6961b722d.zip
drm/amdgpu: disable uvd for sriov
disable uvd for sriov temporarily. Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com> Signed-off-by: Monk Liu <Monk.Liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/soc15.c3
1 files changed, 2 insertions, 1 deletions
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: