diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3335-drm-amdgpu-drop-compute-ring-timeout-setting-for-non.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3335-drm-amdgpu-drop-compute-ring-timeout-setting-for-non.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3335-drm-amdgpu-drop-compute-ring-timeout-setting-for-non.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3335-drm-amdgpu-drop-compute-ring-timeout-setting-for-non.patch new file mode 100644 index 00000000..5975a51f --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3335-drm-amdgpu-drop-compute-ring-timeout-setting-for-non.patch @@ -0,0 +1,57 @@ +From 615d04017b2029292834f2cb9c97fe7857bef1be Mon Sep 17 00:00:00 2001 +From: Evan Quan <evan.quan@amd.com> +Date: Tue, 27 Mar 2018 09:53:15 +0800 +Subject: [PATCH 3335/4131] drm/amdgpu: drop compute ring timeout setting for + non-sriov only (v2) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Sriov still wants these error messags on timeout. So, for sriov +use case, the timeout setting on compute rings is kept. + +-v2: clean the code + +Change-Id: Id0af6959a8023c8d683ff680de7c583f84cfeab3 +Signed-off-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Monk Liu <monk.liu@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +index c39d777..52a2368d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +@@ -409,6 +409,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, + int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, + unsigned num_hw_submission) + { ++ long timeout; + int r; + + /* Check that num_hw_submission is a power of two */ +@@ -433,11 +434,16 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, + + /* No need to setup the GPU scheduler for KIQ ring */ + if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) { ++ /* for non-sriov case, no timeout enforce on compute ring */ ++ if ((ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE) ++ && !amdgpu_sriov_vf(ring->adev)) ++ timeout = MAX_SCHEDULE_TIMEOUT; ++ else ++ timeout = msecs_to_jiffies(amdgpu_lockup_timeout); ++ + r = drm_sched_init(&ring->sched, &amdgpu_sched_ops, + num_hw_submission, amdgpu_job_hang_limit, +- (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE) ? +- MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(amdgpu_lockup_timeout), +- ring->name); ++ timeout, ring->name); + if (r) { + DRM_ERROR("Failed to create scheduler on ring %s.\n", + ring->name); +-- +2.7.4 + |