drm/sched: Use parent fence instead of finished

Using the parent fence instead of the finished fence
to get the job status. This change is to avoid GPU
scheduler timeout error which can cause GPU reset.

Signed-off-by: Arvind Yadav <Arvind.Yadav@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220914164321.2156-6-Arvind.Yadav@amd.com
Signed-off-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index e5a4ecde0063d9b49bde83f83dc122b4692b88f7..4f2395d1a791827cbef80c3a107d52ec1922d1d9 100644 (file)
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -829,7 +829,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
        job = list_first_entry_or_null(&sched->pending_list,
                                       struct drm_sched_job, list);
 
-       if (job && dma_fence_is_signaled(&job->s_fence->finished)) {
+       if (job && dma_fence_is_signaled(job->s_fence->parent)) {
                /* remove job from pending_list */
                list_del_init(&job->list);
 
@@ -841,7 +841,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
 
                if (next) {
                        next->s_fence->scheduled.timestamp =
-                               job->s_fence->finished.timestamp;
+                               job->s_fence->parent->timestamp;
                        /* start TO timer for next job */
                        drm_sched_start_timeout(sched);
                }