drm/amd: reset hw count when reset job

Means the hw ring is empty after gpu reset.

Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@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 70ff09d10885f3d19828233f6bddcc1e227add5c..21c49d38fcb341d34e9996465ce9c98255edc821 100644 (file)
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -393,6 +393,7 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched)
                        s_job->s_fence->parent = NULL;
                }
        }
+       atomic_set(&sched->hw_rq_count, 0);
        spin_unlock(&sched->job_list_lock);
 }
 
@@ -410,6 +411,8 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched)
        list_for_each_entry(s_job, &sched->ring_mirror_list, node) {
                struct amd_sched_fence *s_fence = s_job->s_fence;
                struct fence *fence = sched->ops->run_job(s_job);
+
+               atomic_inc(&sched->hw_rq_count);
                if (fence) {
                        s_fence->parent = fence_get(fence);
                        r = fence_add_callback(fence, &s_fence->cb,