diff options
author | Christian König <christian.koenig@amd.com> | 2018-10-29 09:56:34 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-11-05 14:21:26 -0500 |
commit | 315fed0367b4b4197cdc9585d09a1e659ae6c716 (patch) | |
tree | 9229795c4c8df927885cfa6398ebc2e2982e8a54 /drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |
parent | af70a471bf067d4e808eff2b9c464e6055c98d49 (diff) |
drm/amdgpu: cleanup skipping IB test on KIQ
Instead of hard coding the ring type in the function just never provide
a test_ib callback.
Additional to that remove the emit_ib callback to make sure the nobody
ever tries to execute an IB on the KIQ.
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index c514bb9e94a0..ec0e6238dbc3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |||
@@ -351,15 +351,10 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) | |||
351 | struct amdgpu_ring *ring = adev->rings[i]; | 351 | struct amdgpu_ring *ring = adev->rings[i]; |
352 | long tmo; | 352 | long tmo; |
353 | 353 | ||
354 | if (!ring->sched.ready) | 354 | /* KIQ rings don't have an IB test because we never submit IBs |
355 | continue; | 355 | * to them and they have no interrupt support. |
356 | |||
357 | /* skip IB tests for KIQ in general for the below reasons: | ||
358 | * 1. We never submit IBs to the KIQ | ||
359 | * 2. KIQ doesn't use the EOP interrupts, | ||
360 | * we use some other CP interrupt. | ||
361 | */ | 356 | */ |
362 | if (ring->funcs->type == AMDGPU_RING_TYPE_KIQ) | 357 | if (!ring->sched.ready || !ring->funcs->test_ib) |
363 | continue; | 358 | continue; |
364 | 359 | ||
365 | /* MM engine need more time */ | 360 | /* MM engine need more time */ |