drm/amdgpu: process sched job exactly triggered by fence signal

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian K?nig <christian.koenig@amd.com>

2 files changed, 14 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 53d70f766afe..423cf91ef652 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -404,7 +404,7 @@ struct amdgpu_fence_driver {
 
 struct amdgpu_fence {
         struct fence base;
-        struct fence_cb cb;
+
         /* RB, DMA, etc. */
         struct amdgpu_ring              *ring;
         uint64_t                        seq;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
index 0fcf020917d0..71a4a7e4b1ae 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
@@ -45,19 +45,24 @@ static int amdgpu_sched_prepare_job(struct amd_gpu_scheduler *sched,
 
 static void amdgpu_fence_sched_cb(struct fence *f, struct fence_cb *cb)
 {
-        struct amdgpu_fence *fence =
-                container_of(cb, struct amdgpu_fence, cb);
-        amd_sched_isr(fence->ring->scheduler);
+        struct amd_sched_job *sched_job =
+                container_of(cb, struct amd_sched_job, cb);
+        amd_sched_process_job(sched_job);
 }
 
 static void amdgpu_sched_run_job(struct amd_gpu_scheduler *sched,
                                  struct amd_context_entity *c_entity,
-                                 void *job)
+                                 struct amd_sched_job *job)
 {
         int r = 0;
-        struct amdgpu_cs_parser *sched_job = (struct amdgpu_cs_parser *)job;
+        struct amdgpu_cs_parser *sched_job;
         struct amdgpu_fence *fence;
 
+        if (!job || !job->job) {
+                DRM_ERROR("job is null\n");
+                return;
+        }
+        sched_job = (struct amdgpu_cs_parser *)job->job;
         mutex_lock(&sched_job->job_lock);
         r = amdgpu_ib_schedule(sched_job->adev,
                                sched_job->num_ibs,
@@ -67,8 +72,10 @@ static void amdgpu_sched_run_job(struct amd_gpu_scheduler *sched,
                 goto err;
         fence = sched_job->ibs[sched_job->num_ibs - 1].fence;
         if (fence_add_callback(&fence->base,
-                               &fence->cb, amdgpu_fence_sched_cb))
+                               &job->cb, amdgpu_fence_sched_cb)) {
+                DRM_ERROR("fence add callback failed\n");
                 goto err;
+        }
 
         if (sched_job->run_job) {
                 r = sched_job->run_job(sched_job);