10 files changed, 13 insertions, 11 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index c184468e2b2b..bb5a46a000ee 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -90,7 +90,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,
                         continue;
 
                 r = amd_sched_entity_init(&ring->sched, &ctx->rings[i].entity,
-                                          rq, amdgpu_sched_jobs);
+                                          rq, amdgpu_sched_jobs, NULL);
                 if (r)
                         goto failed;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index ad5bf86ee8a3..bdefc7b9fcff 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -110,7 +110,7 @@ static int amdgpu_ttm_global_init(struct amdgpu_device *adev)
         ring = adev->mman.buffer_funcs_ring;
         rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_KERNEL];
         r = amd_sched_entity_init(&ring->sched, &adev->mman.entity,
-                                  rq, amdgpu_sched_jobs);
+                                  rq, amdgpu_sched_jobs, NULL);
         if (r) {
                 DRM_ERROR("Failed setting up TTM BO move run queue.\n");
                 goto error_entity;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index e8bd50cf9785..6604771356cd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -232,7 +232,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
         ring = &adev->uvd.ring;
         rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL];
         r = amd_sched_entity_init(&ring->sched, &adev->uvd.entity,
-                                  rq, amdgpu_sched_jobs);
+                                  rq, amdgpu_sched_jobs, NULL);
         if (r != 0) {
                 DRM_ERROR("Failed setting up UVD run queue.\n");
                 return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 2918de2f39ec..873c99518954 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -176,7 +176,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
         ring = &adev->vce.ring[0];
         rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL];
         r = amd_sched_entity_init(&ring->sched, &adev->vce.entity,
-                                  rq, amdgpu_sched_jobs);
+                                  rq, amdgpu_sched_jobs, NULL);
         if (r != 0) {
                 DRM_ERROR("Failed setting up VCE run queue.\n");
                 return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 041e0121590c..96df21cca85d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -106,7 +106,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
         ring = &adev->vcn.ring_dec;
         rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL];
         r = amd_sched_entity_init(&ring->sched, &adev->vcn.entity_dec,
-                                  rq, amdgpu_sched_jobs);
+                                  rq, amdgpu_sched_jobs, NULL);
         if (r != 0) {
                 DRM_ERROR("Failed setting up VCN dec run queue.\n");
                 return r;
@@ -115,7 +115,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
         ring = &adev->vcn.ring_enc[0];
         rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL];
         r = amd_sched_entity_init(&ring->sched, &adev->vcn.entity_enc,
-                                  rq, amdgpu_sched_jobs);
+                                  rq, amdgpu_sched_jobs, NULL);
         if (r != 0) {
                 DRM_ERROR("Failed setting up VCN enc run queue.\n");
                 return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index c8c26f21993c..1e727da2bb64 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2637,7 +2637,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
         ring = adev->vm_manager.vm_pte_rings[ring_instance];
         rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_KERNEL];
         r = amd_sched_entity_init(&ring->sched, &vm->entity,
-                                  rq, amdgpu_sched_jobs);
+                                  rq, amdgpu_sched_jobs, NULL);
         if (r)
                 return r;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
index 920910ac8663..246dfd74f5c9 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
@@ -416,7 +416,7 @@ static int uvd_v6_0_sw_init(void *handle)
                 ring = &adev->uvd.ring_enc[0];
                 rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL];
                 r = amd_sched_entity_init(&ring->sched, &adev->uvd.entity_enc,
-                                          rq, amdgpu_sched_jobs);
+                                          rq, amdgpu_sched_jobs, NULL);
                 if (r) {
                         DRM_ERROR("Failed setting up UVD ENC run queue.\n");
                         return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index 6634545060fd..762ff3901a7a 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -418,7 +418,7 @@ static int uvd_v7_0_sw_init(void *handle)
         ring = &adev->uvd.ring_enc[0];
         rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL];
         r = amd_sched_entity_init(&ring->sched, &adev->uvd.entity_enc,
-                                  rq, amdgpu_sched_jobs);
+                                  rq, amdgpu_sched_jobs, NULL);
         if (r) {
                 DRM_ERROR("Failed setting up UVD ENC run queue.\n");
                 return r;
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 5a1ece2774b5..764606ce3541 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -121,7 +121,7 @@ amd_sched_rq_select_entity(struct amd_sched_rq *rq)
 int amd_sched_entity_init(struct amd_gpu_scheduler *sched,
                           struct amd_sched_entity *entity,
                           struct amd_sched_rq *rq,
-                          uint32_t jobs)
+                          uint32_t jobs, atomic_t *guilty)
 {
         int r;
 
@@ -132,6 +132,7 @@ int amd_sched_entity_init(struct amd_gpu_scheduler *sched,
         INIT_LIST_HEAD(&entity->list);
         entity->rq = rq;
         entity->sched = sched;
+        entity->guilty = guilty;
 
         spin_lock_init(&entity->rq_lock);
         spin_lock_init(&entity->queue_lock);
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
index 3ea75a2f35d4..a05994c60b34 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
@@ -63,6 +63,7 @@ struct amd_sched_entity {
 
         struct dma_fence                *dependency;
         struct dma_fence_cb             cb;
+        atomic_t        *guilty; /* points to ctx's guilty */
 };
 
 /**
@@ -155,7 +156,7 @@ void amd_sched_fini(struct amd_gpu_scheduler *sched);
 int amd_sched_entity_init(struct amd_gpu_scheduler *sched,
                           struct amd_sched_entity *entity,
                           struct amd_sched_rq *rq,
-                          uint32_t jobs);
+                          uint32_t jobs, atomic_t* guilty);
 void amd_sched_entity_fini(struct amd_gpu_scheduler *sched,
                            struct amd_sched_entity *entity);
 void amd_sched_entity_push_job(struct amd_sched_job *sched_job);