diff options
| author |   Christian König <christian.koenig@amd.com> | 2016-05-18 13:04:02 +0200 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2016-07-07 14:50:51 -0400 |
| commit | 20df080da27e368eea04e5d69d4c7292f8425281 (patch) | |
| tree | 80304081942f01620171832ef394213558bdc91a /drivers/gpu/drm/amd/scheduler | |
| parent | drm/amdgpu: remove begin_job/finish_job (diff) | |
| download | linux-dev-20df080da27e368eea04e5d69d4c7292f8425281.tar.xz linux-dev-20df080da27e368eea04e5d69d4c7292f8425281.zip | |
drm/amdgpu: remove duplicated timeout callback
No need for double housekeeping here.
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>
Diffstat (limited to 'drivers/gpu/drm/amd/scheduler')
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index 821bc89bd057..f3fd80b93a20 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -343,8 +343,6 @@ static void amd_sched_job_finish(struct amd_sched_job *s_job) struct amd_sched_job, node); if (next) { - INIT_DELAYED_WORK(&next->work_tdr, - s_job->timeout_callback); amd_sched_job_get(next); schedule_delayed_work(&next->work_tdr, sched->timeout); } @@ -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, struct amd_sched_job, node) == s_job) { - INIT_DELAYED_WORK(&s_job->work_tdr, s_job->timeout_callback); amd_sched_job_get(s_job); schedule_delayed_work(&s_job->work_tdr, sched->timeout); } @@ -401,7 +398,7 @@ int amd_sched_job_init(struct amd_sched_job *job, return -ENOMEM; job->s_fence->s_job = job; - job->timeout_callback = timeout_cb; + INIT_DELAYED_WORK(&job->work_tdr, timeout_cb); job->free_callback = free_cb; if (fence) diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h index 69840d7458e6..ec55b9f073d1 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h @@ -87,7 +87,6 @@ struct amd_sched_job { struct work_struct work_free_job; struct list_head node; struct delayed_work work_tdr; - void (*timeout_callback) (struct work_struct *work); void (*free_callback)(struct kref *refcount); }; |