drm/amdgpu: cleanup amdgpu_ib_ring_tests

Test only initialized rings, use the ring name instead of the index in the
error message and note on which device the error occured.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 19 insertions, 16 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index fc74f40a5912..c514bb9e94a0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -347,11 +347,11 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
                 tmo_gfx = 8 * AMDGPU_IB_TEST_TIMEOUT;
         }
 
-        for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
+        for (i = 0; i < adev->num_rings; ++i) {
                 struct amdgpu_ring *ring = adev->rings[i];
                 long tmo;
 
-                if (!ring || !ring->sched.ready)
+                if (!ring->sched.ready)
                         continue;
 
                 /* skip IB tests for KIQ in general for the below reasons:
@@ -374,20 +374,23 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev)
                         tmo = tmo_gfx;
 
                 r = amdgpu_ring_test_ib(ring, tmo);
-                if (r) {
-                        ring->sched.ready = false;
-
-                        if (ring == &adev->gfx.gfx_ring[0]) {
-                                /* oh, oh, that's really bad */
-                                DRM_ERROR("amdgpu: failed testing IB on GFX ring (%d).\n", r);
-                                adev->accel_working = false;
-                                return r;
-
-                        } else {
-                                /* still not good, but we can live with it */
-                                DRM_ERROR("amdgpu: failed testing IB on ring %d (%d).\n", i, r);
-                                ret = r;
-                        }
+                if (!r) {
+                        DRM_DEV_DEBUG(adev->dev, "ib test on %s succeeded\n",
+                                      ring->name);
+                        continue;
+                }
+
+                ring->sched.ready = false;
+                DRM_DEV_ERROR(adev->dev, "IB test failed on %s (%d).\n",
+                          ring->name, r);
+
+                if (ring == &adev->gfx.gfx_ring[0]) {
+                        /* oh, oh, that's really bad */
+                        adev->accel_working = false;
+                        return r;
+
+                } else {
+                        ret = r;
                 }
         }
         return ret;