aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 03a69942cce5..a162d87ca0c8 100644
--- 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,
149 return -EINVAL; 149 return -EINVAL;
150 } 150 }
151 151
152 if (vm && !job->vm_id) { 152 if (vm && !job->vmid) {
153 dev_err(adev->dev, "VM IB without ID\n"); 153 dev_err(adev->dev, "VM IB without ID\n");
154 return -EINVAL; 154 return -EINVAL;
155 } 155 }
@@ -211,7 +211,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
211 !amdgpu_sriov_vf(adev)) /* for SRIOV preemption, Preamble CE ib must be inserted anyway */ 211 !amdgpu_sriov_vf(adev)) /* for SRIOV preemption, Preamble CE ib must be inserted anyway */
212 continue; 212 continue;
213 213
214 amdgpu_ring_emit_ib(ring, ib, job ? job->vm_id : 0, 214 amdgpu_ring_emit_ib(ring, ib, job ? job->vmid : 0,
215 need_ctx_switch); 215 need_ctx_switch);
216 need_ctx_switch = false; 216 need_ctx_switch = false;
217 } 217 }
@@ -229,8 +229,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
229 r = amdgpu_fence_emit(ring, f); 229 r = amdgpu_fence_emit(ring, f);
230 if (r) { 230 if (r) {
231 dev_err(adev->dev, "failed to emit fence (%d)\n", r); 231 dev_err(adev->dev, "failed to emit fence (%d)\n", r);
232 if (job && job->vm_id) 232 if (job && job->vmid)
233 amdgpu_vmid_reset(adev, ring->funcs->vmhub, job->vm_id); 233 amdgpu_vmid_reset(adev, ring->funcs->vmhub, job->vmid);
234 amdgpu_ring_undo(ring); 234 amdgpu_ring_undo(ring);
235 return r; 235 return r;
236 } 236 }