drm/amdgpu/gfx10: make ring tests less chatty

We already did this for older generations.

Reviewed-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/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index 98db252..5342199 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -471,18 +471,10 @@ static int gfx_v10_0_ring_test_ring(struct amdgpu_ring *ring)
                else
                        udelay(1);
        }
-       if (i < adev->usec_timeout) {
-               if (amdgpu_emu_mode == 1)
-                       DRM_INFO("ring test on %d succeeded in %d msecs\n",
-                                ring->idx, i);
-               else
-                       DRM_INFO("ring test on %d succeeded in %d usecs\n",
-                                ring->idx, i);
-       } else {
-               DRM_ERROR("amdgpu: ring %d test failed (scratch(0x%04X)=0x%08X)\n",
-                         ring->idx, scratch, tmp);
-               r = -EINVAL;
-       }
+
+       if (i >= adev->usec_timeout)
+               r = -ETIMEDOUT;
+
        amdgpu_gfx_scratch_free(adev, scratch);
 
        return r;
@@ -532,14 +524,10 @@ static int gfx_v10_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        }
 
        tmp = RREG32(scratch);
-       if (tmp == 0xDEADBEEF) {
-               DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
+       if (tmp == 0xDEADBEEF)
                r = 0;
-       } else {
-               DRM_ERROR("amdgpu: ib test failed (scratch(0x%04X)=0x%08X)\n",
-                         scratch, tmp);
+       else
                r = -EINVAL;
-       }
 err2:
        amdgpu_ib_free(adev, &ib, NULL);
        dma_fence_put(f);
@@ -3606,23 +3594,16 @@ static int gfx_v10_0_cp_resume(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->gfx.num_gfx_rings; i++) {
                ring = &adev->gfx.gfx_ring[i];
-               DRM_INFO("gfx %d ring me %d pipe %d q %d\n",
-                        i, ring->me, ring->pipe, ring->queue);
-               r = amdgpu_ring_test_ring(ring);
-               if (r) {
-                       ring->sched.ready = false;
+               r = amdgpu_ring_test_helper(ring);
+               if (r)
                        return r;
-               }
        }
 
        for (i = 0; i < adev->gfx.num_compute_rings; i++) {
                ring = &adev->gfx.compute_ring[i];
-               ring->sched.ready = true;
-               DRM_INFO("compute ring %d mec %d pipe %d q %d\n",
-                        i, ring->me, ring->pipe, ring->queue);
-               r = amdgpu_ring_test_ring(ring);
+               r = amdgpu_ring_test_helper(ring);
                if (r)
-                       ring->sched.ready = false;
+                       return r;
        }
 
        return 0;