Commit 20df080d authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: remove duplicated timeout callback

No need for double housekeeping here.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMonk.Liu <monk.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7392c329
...@@ -343,8 +343,6 @@ static void amd_sched_job_finish(struct amd_sched_job *s_job) ...@@ -343,8 +343,6 @@ static void amd_sched_job_finish(struct amd_sched_job *s_job)
struct amd_sched_job, node); struct amd_sched_job, node);
if (next) { if (next) {
INIT_DELAYED_WORK(&next->work_tdr,
s_job->timeout_callback);
amd_sched_job_get(next); amd_sched_job_get(next);
schedule_delayed_work(&next->work_tdr, sched->timeout); schedule_delayed_work(&next->work_tdr, sched->timeout);
} }
...@@ -359,7 +357,6 @@ static void amd_sched_job_begin(struct amd_sched_job *s_job) ...@@ -359,7 +357,6 @@ static void amd_sched_job_begin(struct amd_sched_job *s_job)
list_first_entry_or_null(&sched->ring_mirror_list, list_first_entry_or_null(&sched->ring_mirror_list,
struct amd_sched_job, node) == s_job) struct amd_sched_job, node) == s_job)
{ {
INIT_DELAYED_WORK(&s_job->work_tdr, s_job->timeout_callback);
amd_sched_job_get(s_job); amd_sched_job_get(s_job);
schedule_delayed_work(&s_job->work_tdr, sched->timeout); schedule_delayed_work(&s_job->work_tdr, sched->timeout);
} }
...@@ -401,7 +398,7 @@ int amd_sched_job_init(struct amd_sched_job *job, ...@@ -401,7 +398,7 @@ int amd_sched_job_init(struct amd_sched_job *job,
return -ENOMEM; return -ENOMEM;
job->s_fence->s_job = job; job->s_fence->s_job = job;
job->timeout_callback = timeout_cb; INIT_DELAYED_WORK(&job->work_tdr, timeout_cb);
job->free_callback = free_cb; job->free_callback = free_cb;
if (fence) if (fence)
......
...@@ -87,7 +87,6 @@ struct amd_sched_job { ...@@ -87,7 +87,6 @@ struct amd_sched_job {
struct work_struct work_free_job; struct work_struct work_free_job;
struct list_head node; struct list_head node;
struct delayed_work work_tdr; struct delayed_work work_tdr;
void (*timeout_callback) (struct work_struct *work);
void (*free_callback)(struct kref *refcount); void (*free_callback)(struct kref *refcount);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment