diff options
author | Xiangliang Yu <Xiangliang.Yu@amd.com> | 2017-03-08 01:35:16 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-03-29 23:55:11 -0400 |
commit | e76347b0c2c5c23150d331aad8d8a2dffafeee6a (patch) | |
tree | 7556d09a6a90ab69b745314d92ce37250b50c43b | |
parent | f5dee228242309c3288ee4d2a7152e482f103195 (diff) |
drm/amdgpu/vce4: Ignore vce ring/ib test temporarily
In order to not break SRIOV gfx development, will revert
this patch after vce proved working.
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>
Reviewed-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/amdgpu_vce.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index a76175a9f878..0184197eb000 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |||
@@ -957,6 +957,10 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) | |||
957 | unsigned i; | 957 | unsigned i; |
958 | int r; | 958 | int r; |
959 | 959 | ||
960 | /* TODO: remove it if VCE can work for sriov */ | ||
961 | if (amdgpu_sriov_vf(adev)) | ||
962 | return 0; | ||
963 | |||
960 | r = amdgpu_ring_alloc(ring, 16); | 964 | r = amdgpu_ring_alloc(ring, 16); |
961 | if (r) { | 965 | if (r) { |
962 | DRM_ERROR("amdgpu: vce failed to lock ring %d (%d).\n", | 966 | DRM_ERROR("amdgpu: vce failed to lock ring %d (%d).\n", |
@@ -995,6 +999,10 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout) | |||
995 | struct dma_fence *fence = NULL; | 999 | struct dma_fence *fence = NULL; |
996 | long r; | 1000 | long r; |
997 | 1001 | ||
1002 | /* TODO: remove it if VCE can work for sriov */ | ||
1003 | if (amdgpu_sriov_vf(ring->adev)) | ||
1004 | return 0; | ||
1005 | |||
998 | /* skip vce ring1/2 ib test for now, since it's not reliable */ | 1006 | /* skip vce ring1/2 ib test for now, since it's not reliable */ |
999 | if (ring != &ring->adev->vce.ring[0]) | 1007 | if (ring != &ring->adev->vce.ring[0]) |
1000 | return 0; | 1008 | return 0; |