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>

diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 821bc89bd057e3e4af4c03275119d082b2c055da..f3fd80b93a2072ff7aec855ac7096f5534064a80 100644 (file)
--- 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 69840d7458e6a13f65837b999e2c85abbdf2d85a..ec55b9f073d13a362e95a5d5d45a5a25dbc073f4 100644 (file)
--- 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);
 };