drm/amdgpu: move ring from IBs into job

We can't submit to multiple rings at the same time anyway.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
index 10d098e33707..84453c1c4b07 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
@@ -70,7 +70,7 @@ static struct fence *amdgpu_sched_dependency(struct amd_sched_job *sched_job)
         struct fence *fence = amdgpu_sync_get_fence(sync);
 
         if (fence == NULL && vm && !job->ibs->grabbed_vmid) {
-                struct amdgpu_ring *ring = job->ibs->ring;
+                struct amdgpu_ring *ring = job->ring;
                 int r;
 
                 r = amdgpu_vm_grab_id(vm, ring, sync,
@@ -98,7 +98,7 @@ static struct fence *amdgpu_sched_run_job(struct amd_sched_job *sched_job)
         }
         job = to_amdgpu_job(sched_job);
         trace_amdgpu_sched_run_job(job);
-        r = amdgpu_ib_schedule(job->adev, job->num_ibs, job->ibs, job->owner);
+        r = amdgpu_ib_schedule(job->ring, job->num_ibs, job->ibs, job->owner);
         if (r) {
                 DRM_ERROR("Error scheduling IBs (%d)\n", r);
                 goto err;
@@ -142,6 +142,7 @@ int amdgpu_sched_ib_submit_kernel_helper(struct amdgpu_device *adev,
         *f = fence_get(&job->base.s_fence->base);
 
         job->adev = adev;
+        job->ring = ring;
         job->ibs = ibs;
         job->num_ibs = num_ibs;
         job->owner = owner;