drm/amdgpu: move VM fields into job

They are the same for all IBs.

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

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index a0961f2a93d2..8ea68d0cfad6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -142,23 +142,15 @@ static struct fence *amdgpu_job_dependency(struct amd_sched_job *sched_job)
 
         struct fence *fence = amdgpu_sync_get_fence(&job->sync);
 
-        if (fence == NULL && vm && !job->ibs->vm_id) {
+        if (fence == NULL && vm && !job->vm_id) {
                 struct amdgpu_ring *ring = job->ring;
-                unsigned i, vm_id;
-                uint64_t vm_pd_addr;
                 int r;
 
                 r = amdgpu_vm_grab_id(vm, ring, &job->sync,
                                       &job->base.s_fence->base,
-                                      &vm_id, &vm_pd_addr);
+                                      &job->vm_id, &job->vm_pd_addr);
                 if (r)
                         DRM_ERROR("Error getting VM ID (%d)\n", r);
-                else {
-                        for (i = 0; i < job->num_ibs; ++i) {
-                                job->ibs[i].vm_id = vm_id;
-                                job->ibs[i].vm_pd_addr = vm_pd_addr;
-                        }
-                }
 
                 fence = amdgpu_sync_get_fence(&job->sync);
         }