Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_ib.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 659997bfff303b789f9f5fa6ae8ec17b0a02ae5c..a162d87ca0c8e7bedf2d936f4cd63abf98fe534e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -149,7 +149,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                return -EINVAL;
        }
 
-       if (vm && !job->vm_id) {
+       if (vm && !job->vmid) {
                dev_err(adev->dev, "VM IB without ID\n");
                return -EINVAL;
        }
@@ -164,7 +164,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
        }
 
        if (ring->funcs->emit_pipeline_sync && job &&
-           ((tmp = amdgpu_sync_get_fence(&job->sched_sync)) ||
+           ((tmp = amdgpu_sync_get_fence(&job->sched_sync, NULL)) ||
             amdgpu_vm_need_pipeline_sync(ring, job))) {
                need_pipe_sync = true;
                dma_fence_put(tmp);
@@ -211,7 +211,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
                        !amdgpu_sriov_vf(adev)) /* for SRIOV preemption, Preamble CE ib must be inserted anyway */
                        continue;
 
-               amdgpu_ring_emit_ib(ring, ib, job ? job->vm_id : 0,
+               amdgpu_ring_emit_ib(ring, ib, job ? job->vmid : 0,
                                    need_ctx_switch);
                need_ctx_switch = false;
        }
@@ -229,9 +229,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
        r = amdgpu_fence_emit(ring, f);
        if (r) {
                dev_err(adev->dev, "failed to emit fence (%d)\n", r);
-               if (job && job->vm_id)
-                       amdgpu_vm_reset_id(adev, ring->funcs->vmhub,
-                                          job->vm_id);
+               if (job && job->vmid)
+                       amdgpu_vmid_reset(adev, ring->funcs->vmhub, job->vmid);
                amdgpu_ring_undo(ring);
                return r;
        }