diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0656-drm-amdgpu-fix-stoping-the-scheduler-timeout.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0656-drm-amdgpu-fix-stoping-the-scheduler-timeout.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0656-drm-amdgpu-fix-stoping-the-scheduler-timeout.patch b/common/recipes-kernel/linux/files/0656-drm-amdgpu-fix-stoping-the-scheduler-timeout.patch new file mode 100644 index 00000000..5a283681 --- /dev/null +++ b/common/recipes-kernel/linux/files/0656-drm-amdgpu-fix-stoping-the-scheduler-timeout.patch @@ -0,0 +1,33 @@ +From 08bd80b0d31484a00e72dcc8e269fa60add9a310 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com> +Date: Mon, 2 Nov 2015 16:25:10 +0100 +Subject: [PATCH 0656/1050] drm/amdgpu: fix stoping the scheduler timeout +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +cancel_delayed_work_sync is forbidden in interrupt context. + +Signed-off-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +index b3e84d0..89619a5 100644 +--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c ++++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +@@ -338,7 +338,7 @@ static void amd_sched_process_job(struct fence *f, struct fence_cb *cb) + atomic_dec(&sched->hw_rq_count); + amd_sched_fence_signal(s_fence); + if (sched->timeout != MAX_SCHEDULE_TIMEOUT) { +- cancel_delayed_work_sync(&s_fence->dwork); ++ cancel_delayed_work(&s_fence->dwork); + spin_lock_irqsave(&sched->fence_list_lock, flags); + list_del_init(&s_fence->list); + spin_unlock_irqrestore(&sched->fence_list_lock, flags); +-- +1.9.1 + |