drm/amdgpu: Skip uvd and vce ring test for SRIOV

Since rptr would not be accessed on later secure asics in sriov, remove
the ring test.

Signed-off-by: Frank Min <Frank.Min@amd.com>
Signed-off-by: Xiangliang.Yu <Xiangliang.Yu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 5 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index b692ad402252..c855366521ab 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -937,9 +937,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
         unsigned i;
         int r, timeout = adev->usec_timeout;
 
-        /* workaround VCE ring test slow issue for sriov*/
+        /* skip ring test for sriov*/
         if (amdgpu_sriov_vf(adev))
-                timeout *= 10;
+                return 0;
 
         r = amdgpu_ring_alloc(ring, 16);
         if (r) {
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index fbf7b412a7fb..ab447e8e1954 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -165,6 +165,9 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring)
         unsigned i;
         int r;
 
+        if (amdgpu_sriov_vf(adev))
+                return 0;
+
         r = amdgpu_ring_alloc(ring, 16);
         if (r) {
                 DRM_ERROR("amdgpu: uvd enc failed to lock ring %d (%d).\n",