diff options
author | Chunming Zhou <David1.Zhou@amd.com> | 2016-06-29 23:30:37 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 15:06:13 -0400 |
commit | e686e75dacb262a7d5f6673e1b9bfe0e62cd287a (patch) | |
tree | 2afa1cdf2ebcd06aa87a9068968de6beb10136b6 | |
parent | 754ce0fa55c4e464626e961ddb98f935ab85aa19 (diff) |
drm/amd: add amd_sched_hw_job_reset
amd_sched_hw_job_reset will remove callback from hw fence.
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 | 14 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index 717655d0c642..cf2d64bef0df 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | |||
@@ -381,6 +381,20 @@ static void amd_sched_job_timedout(struct work_struct *work) | |||
381 | job->sched->ops->timedout_job(job); | 381 | job->sched->ops->timedout_job(job); |
382 | } | 382 | } |
383 | 383 | ||
384 | void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched) | ||
385 | { | ||
386 | struct amd_sched_job *s_job; | ||
387 | |||
388 | spin_lock(&sched->job_list_lock); | ||
389 | list_for_each_entry_reverse(s_job, &sched->ring_mirror_list, node) { | ||
390 | if (fence_remove_callback(s_job->s_fence->parent, &s_job->s_fence->cb)) { | ||
391 | fence_put(s_job->s_fence->parent); | ||
392 | s_job->s_fence->parent = NULL; | ||
393 | } | ||
394 | } | ||
395 | spin_unlock(&sched->job_list_lock); | ||
396 | } | ||
397 | |||
384 | /** | 398 | /** |
385 | * Submit a job to the job queue | 399 | * Submit a job to the job queue |
386 | * | 400 | * |
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h index 545fda73a05f..fdcd8fbf5e26 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | |||
@@ -153,4 +153,5 @@ int amd_sched_job_init(struct amd_sched_job *job, | |||
153 | struct amd_gpu_scheduler *sched, | 153 | struct amd_gpu_scheduler *sched, |
154 | struct amd_sched_entity *entity, | 154 | struct amd_sched_entity *entity, |
155 | void *owner); | 155 | void *owner); |
156 | void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched); | ||
156 | #endif | 157 | #endif |