drm/amdgpu:add hang_limit for sched(v2)

since gpu_scheduler source domain cannot access amdgpu variable
so need create the hang_limit membewr for sched, and it can
refer it for the upcoming GPU RESET patches

v2:
make hang_limit a parameter of sched_init()

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Chunming Zhou <David1.Zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

3 files changed, 8 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 219c15f79a5d..72e8eacc2c03 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -446,7 +446,7 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,
                         timeout = MAX_SCHEDULE_TIMEOUT;
                 }
                 r = amd_sched_init(&ring->sched, &amdgpu_sched_ops,
-                                   num_hw_submission,
+                                   num_hw_submission, amdgpu_job_hang_limit,
                                    timeout, ring->name);
                 if (r) {
                         DRM_ERROR("Failed to create scheduler on ring %s.\n",
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 9061c88e3e0c..5a1ece2774b5 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -676,13 +676,17 @@ static int amd_sched_main(void *param)
 */
 int amd_sched_init(struct amd_gpu_scheduler *sched,
                    const struct amd_sched_backend_ops *ops,
-                   unsigned hw_submission, long timeout, const char *name)
+                   unsigned hw_submission,
+                   unsigned hang_limit,
+                   long timeout,
+                   const char *name)
 {
         int i;
         sched->ops = ops;
         sched->hw_submission_limit = hw_submission;
         sched->name = name;
         sched->timeout = timeout;
+        sched->hang_limit = hang_limit;
         for (i = AMD_SCHED_PRIORITY_MIN; i < AMD_SCHED_PRIORITY_MAX; i++)
                 amd_sched_rq_init(&sched->sched_rq[i]);
 
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
index 3f75b45ed958..3ea75a2f35d4 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
@@ -144,11 +144,12 @@ struct amd_gpu_scheduler {
         struct task_struct              *thread;
         struct list_head        ring_mirror_list;
         spinlock_t                      job_list_lock;
+        int hang_limit;
 };
 
 int amd_sched_init(struct amd_gpu_scheduler *sched,
                    const struct amd_sched_backend_ops *ops,
-                   uint32_t hw_submission, long timeout, const char *name);
+                   uint32_t hw_submission, unsigned hang_limit, long timeout, const char *name);
 void amd_sched_fini(struct amd_gpu_scheduler *sched);
 
 int amd_sched_entity_init(struct amd_gpu_scheduler *sched,