drm/amdgpu/vce4: enable ring & ib test for sriov

Now VCE block can work for SRIOV, enable ring & ib test.

Signed-off-by: Frank Min <Frank.Min@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 7a8eaeaae94a48f1d13105922f0c7fa7bde17d4a..735c38d7db0d7da44eff5239d448095d677be6b6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -961,10 +961,6 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
        if (amdgpu_sriov_vf(adev))
                timeout *= 10;
 
-       /* TODO: remove it if VCE can work for sriov */
-       if (amdgpu_sriov_vf(adev))
-               return 0;
-
        r = amdgpu_ring_alloc(ring, 16);
        if (r) {
                DRM_ERROR("amdgpu: vce failed to lock ring %d (%d).\n",
@@ -1003,10 +999,6 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        struct dma_fence *fence = NULL;
        long r;
 
-       /* TODO: remove it if VCE can work for sriov */
-       if (amdgpu_sriov_vf(ring->adev))
-               return 0;
-
        /* skip vce ring1/2 ib test for now, since it's not reliable */
        if (ring != &ring->adev->vce.ring[0])
                return 0;