drm/amdgpu: properly abstract scheduler timeout handling

The driver shouldn't mess with the scheduler internals.

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>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index be4698b0b33b..32132f2e236d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -34,13 +34,14 @@ static void amdgpu_job_free_handler(struct work_struct *ws)
         amd_sched_job_put(&job->base);
 }
 
-void amdgpu_job_timeout_func(struct work_struct *work)
+static void amdgpu_job_timedout(struct amd_sched_job *s_job)
 {
-        struct amdgpu_job *job = container_of(work, struct amdgpu_job, base.work_tdr.work);
+        struct amdgpu_job *job = container_of(s_job, struct amdgpu_job, base);
+
         DRM_ERROR("ring %s timeout, last signaled seq=%u, last emitted seq=%u\n",
-                                job->base.sched->name,
-                                (uint32_t)atomic_read(&job->ring->fence_drv.last_seq),
-                                job->ring->fence_drv.sync_seq);
+                  job->base.sched->name,
+                  atomic_read(&job->ring->fence_drv.last_seq),
+                  job->ring->fence_drv.sync_seq);
 
         amd_sched_job_put(&job->base);
 }
@@ -126,8 +127,7 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring,
                 return -EINVAL;
 
         r = amd_sched_job_init(&job->base, &ring->sched,
-                               entity, amdgpu_job_timeout_func,
-                               amdgpu_job_free_func, owner, &fence);
+                               entity, amdgpu_job_free_func, owner, &fence);
         if (r)
                 return r;
 
@@ -197,4 +197,5 @@ err:
 const struct amd_sched_backend_ops amdgpu_sched_ops = {
         .dependency = amdgpu_job_dependency,
         .run_job = amdgpu_job_run,
+        .timedout_job = amdgpu_job_timedout,
 };