openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: remove begin_job/finish_job 

Completely pointless and confusing to use a callback
to call into the same code file.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Monk.Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2016-05-18 13:00:38 +02:00 committed by Alex Deucher
parent 16a7133f35
commit 7392c329ee
4 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
View File

@ -193,6 +193,4 @@ static struct fence *amdgpu_job_run(struct amd_sched_job *sched_job)
const struct amd_sched_backend_ops amdgpu_sched_ops = { const struct amd_sched_backend_ops amdgpu_sched_ops = {
.dependency = amdgpu_job_dependency, .dependency = amdgpu_job_dependency,
.run_job = amdgpu_job_run, .run_job = amdgpu_job_run,
.begin_job = amd_sched_job_begin,
.finish_job = amd_sched_job_finish,
}; };

13
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
View File

@ -329,7 +329,7 @@ static void amd_sched_free_job(struct fence *f, struct fence_cb *cb) {
/* job_finish is called after hw fence signaled, and /* job_finish is called after hw fence signaled, and
* the job had already been deleted from ring_mirror_list * the job had already been deleted from ring_mirror_list
*/ */
void amd_sched_job_finish(struct amd_sched_job *s_job) static void amd_sched_job_finish(struct amd_sched_job *s_job)
{ {
struct amd_sched_job *next; struct amd_sched_job *next;
struct amd_gpu_scheduler *sched = s_job->sched; struct amd_gpu_scheduler *sched = s_job->sched;
@ -351,7 +351,7 @@ void amd_sched_job_finish(struct amd_sched_job *s_job)
} }
} }
void amd_sched_job_begin(struct amd_sched_job *s_job) static void amd_sched_job_begin(struct amd_sched_job *s_job)
{ {
struct amd_gpu_scheduler *sched = s_job->sched; struct amd_gpu_scheduler *sched = s_job->sched;
@ -461,7 +461,7 @@ static void amd_sched_process_job(struct fence *f, struct fence_cb *cb)
/* remove job from ring_mirror_list */ /* remove job from ring_mirror_list */
spin_lock_irqsave(&sched->job_list_lock, flags); spin_lock_irqsave(&sched->job_list_lock, flags);
list_del_init(&s_fence->s_job->node); list_del_init(&s_fence->s_job->node);
sched->ops->finish_job(s_fence->s_job); amd_sched_job_finish(s_fence->s_job);
spin_unlock_irqrestore(&sched->job_list_lock, flags); spin_unlock_irqrestore(&sched->job_list_lock, flags);
amd_sched_fence_signal(s_fence); amd_sched_fence_signal(s_fence);
@ -475,6 +475,7 @@ static int amd_sched_main(void *param)
{ {
struct sched_param sparam = {.sched_priority = 1}; struct sched_param sparam = {.sched_priority = 1};
struct amd_gpu_scheduler *sched = (struct amd_gpu_scheduler *)param; struct amd_gpu_scheduler *sched = (struct amd_gpu_scheduler *)param;
unsigned long flags;
int r, count; int r, count;
sched_setscheduler(current, SCHED_FIFO, &sparam); sched_setscheduler(current, SCHED_FIFO, &sparam);
@ -499,7 +500,11 @@ static int amd_sched_main(void *param)
s_fence = sched_job->s_fence; s_fence = sched_job->s_fence;
atomic_inc(&sched->hw_rq_count); atomic_inc(&sched->hw_rq_count);
amd_sched_job_pre_schedule(sched, sched_job); spin_lock_irqsave(&sched->job_list_lock, flags);
list_add_tail(&sched_job->node, &sched->ring_mirror_list);
amd_sched_job_begin(sched_job);
spin_unlock_irqrestore(&sched->job_list_lock, flags);
fence = sched->ops->run_job(sched_job); fence = sched->ops->run_job(sched_job);
amd_sched_fence_scheduled(s_fence); amd_sched_fence_scheduled(s_fence);
if (fence) { if (fence) {

6
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
View File

@ -110,8 +110,6 @@ static inline struct amd_sched_fence *to_amd_sched_fence(struct fence *f)
struct amd_sched_backend_ops { struct amd_sched_backend_ops {
struct fence *(*dependency)(struct amd_sched_job *sched_job); struct fence *(*dependency)(struct amd_sched_job *sched_job);
struct fence *(*run_job)(struct amd_sched_job *sched_job); struct fence *(*run_job)(struct amd_sched_job *sched_job);
void (*begin_job)(struct amd_sched_job *sched_job);
void (*finish_job)(struct amd_sched_job *sched_job);
}; };
enum amd_sched_priority { enum amd_sched_priority {
@ -160,10 +158,6 @@ int amd_sched_job_init(struct amd_sched_job *job,
void (*timeout_cb)(struct work_struct *work), void (*timeout_cb)(struct work_struct *work),
void (*free_cb)(struct kref* refcount), void (*free_cb)(struct kref* refcount),
void *owner, struct fence **fence); void *owner, struct fence **fence);
void amd_sched_job_pre_schedule(struct amd_gpu_scheduler *sched ,
struct amd_sched_job *s_job);
void amd_sched_job_finish(struct amd_sched_job *s_job);
void amd_sched_job_begin(struct amd_sched_job *s_job);
static inline void amd_sched_job_get(struct amd_sched_job *job) static inline void amd_sched_job_get(struct amd_sched_job *job)
{ {
if (job) if (job)

10
drivers/gpu/drm/amd/scheduler/sched_fence.c
View File

@ -58,16 +58,6 @@ void amd_sched_fence_signal(struct amd_sched_fence *fence)
FENCE_TRACE(&fence->base, "was already signaled\n"); FENCE_TRACE(&fence->base, "was already signaled\n");
} }
void amd_sched_job_pre_schedule(struct amd_gpu_scheduler *sched ,
struct amd_sched_job *s_job)
{
unsigned long flags;
spin_lock_irqsave(&sched->job_list_lock, flags);
list_add_tail(&s_job->node, &sched->ring_mirror_list);
sched->ops->begin_job(s_job);
spin_unlock_irqrestore(&sched->job_list_lock, flags);
}
void amd_sched_fence_scheduled(struct amd_sched_fence *s_fence) void amd_sched_fence_scheduled(struct amd_sched_fence *s_fence)
{ {
struct fence_cb *cur, *tmp; struct fence_cb *cur, *tmp;