diff options
| author |   Chunming Zhou <david1.zhou@amd.com> | 2017-11-07 10:40:00 +0800 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2017-12-06 12:47:18 -0500 |
| commit | f4323bccd17bca85f9ed10c85ed85bdd6c0b431a (patch) | |
| tree | f6ffd6c466a7495769fe4d72eb6410e5b0cc0877 | |
| parent | drm/amdgpu: revise retry init to fully cleanup driver (diff) | |
| download | linux-dev-f4323bccd17bca85f9ed10c85ed85bdd6c0b431a.tar.xz linux-dev-f4323bccd17bca85f9ed10c85ed85bdd6c0b431a.zip | |
drm/amd/scheduler: fix page protection of cb
We must remove the fence callback.
Signed-off-by: Chunming Zhou <david1.zhou@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/scheduler/gpu_scheduler.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index 53ea7e12d219..9e3748a5b398 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -229,6 +229,13 @@ void amd_sched_entity_fini(struct amd_gpu_scheduler *sched, */ kthread_park(sched->thread); kthread_unpark(sched->thread); + if (entity->dependency) { + dma_fence_remove_callback(entity->dependency, + &entity->cb); + dma_fence_put(entity->dependency); + entity->dependency = NULL; + } + while ((job = to_amd_sched_job(spsc_queue_pop(&entity->job_queue)))) { struct amd_sched_fence *s_fence = job->s_fence; amd_sched_fence_scheduled(s_fence); |