xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: cleanup amdgpu_ib_ring_tests

Browse Source 
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>
This commit is contained in:
Christian König
2018-10-29 10:55:23 +01:00
committed by Alex Deucher
parent dc9eeff84c
commit af70a471bf
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
View File

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