drm/amdgpu/sdma5: make ring tests less chatty
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 13 Dec 2019 18:25:39 +0000 (13:25 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 18 Dec 2019 21:09:11 +0000 (16:09 -0500)
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>
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c

index f4ad2990f97303a13f1e3663884bde2572792336..1d5b47162979b1b07ae57d6ef880c30e0e701f4a 100644 (file)
@@ -907,16 +907,9 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring)
                        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 (0x%08X)\n",
-                         ring->idx, tmp);
-               r = -EINVAL;
-       }
+       if (i >= adev->usec_timeout)
+               r = -ETIMEDOUT;
+
        amdgpu_device_wb_free(adev, index);
 
        return r;
@@ -981,13 +974,10 @@ static int sdma_v5_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                goto err1;
        }
        tmp = le32_to_cpu(adev->wb.wb[index]);
-       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 (0x%08X)\n", tmp);
+       else
                r = -EINVAL;
-       }
 
 err1:
        amdgpu_ib_free(adev, &ib, NULL);