aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Quan <evan.quan@amd.com>2018-03-14 21:49:01 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-03-21 15:36:57 -0400
commitf0c2b16ba84a0b8b960a6d442496ce2d2e6bfa99 (patch)
treec8320a4044e341eda7bdfa60b2f9a047ae9ba5ca
parentdc53d543fcb4fdcd836fffaf0b12d3b1b69cde62 (diff)
drm/amdgpu: no job timeout setting on compute queues
Under some heavy computing environment(e.g. dgemm test), it takes the asic over 10+ seconds to finish the dispatched job which will trigger the timeout. It's quite confusing although it does not seem to bring any real problems. As a quick workround, we choose to not enfoce the timeout setting on compute queues. Signed-off-by: Evan Quan <evan.quan@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 008e1984b7e3..455a81e4c246 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -435,7 +435,9 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,
435 if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) { 435 if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) {
436 r = drm_sched_init(&ring->sched, &amdgpu_sched_ops, 436 r = drm_sched_init(&ring->sched, &amdgpu_sched_ops,
437 num_hw_submission, amdgpu_job_hang_limit, 437 num_hw_submission, amdgpu_job_hang_limit,
438 msecs_to_jiffies(amdgpu_lockup_timeout), ring->name); 438 (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE) ?
439 MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(amdgpu_lockup_timeout),
440 ring->name);
439 if (r) { 441 if (r) {
440 DRM_ERROR("Failed to create scheduler on ring %s.\n", 442 DRM_ERROR("Failed to create scheduler on ring %s.\n",
441 ring->name); 443 ring->name);