diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3334-drm-amdgpu-no-job-timeout-setting-on-compute-queues.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3334-drm-amdgpu-no-job-timeout-setting-on-compute-queues.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3334-drm-amdgpu-no-job-timeout-setting-on-compute-queues.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3334-drm-amdgpu-no-job-timeout-setting-on-compute-queues.patch new file mode 100644 index 00000000..b680e439 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3334-drm-amdgpu-no-job-timeout-setting-on-compute-queues.patch @@ -0,0 +1,43 @@ +From 36f33533c5840669346d31f5ad0f3db8b7481d9c Mon Sep 17 00:00:00 2001 +From: Evan Quan <evan.quan@amd.com> +Date: Thu, 15 Mar 2018 09:49:01 +0800 +Subject: [PATCH 3334/4131] drm/amdgpu: no job timeout setting on compute + queues +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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. + +Change-Id: Iba96202253a255586ed066b8ace48379c6e98d54 +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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +index 9e2c225..c39d777 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, + if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) { + r = drm_sched_init(&ring->sched, &amdgpu_sched_ops, + num_hw_submission, amdgpu_job_hang_limit, +- msecs_to_jiffies(amdgpu_lockup_timeout), ring->name); ++ (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE) ? ++ MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(amdgpu_lockup_timeout), ++ ring->name); + if (r) { + DRM_ERROR("Failed to create scheduler on ring %s.\n", + ring->name); +-- +2.7.4 + |