drm/amdgpu: rename vm_id to vmid

sed -i "s/vm_id/vmid/g" drivers/gpu/drm/amd/amdgpu/*.c
sed -i "s/vm_id/vmid/g" drivers/gpu/drm/amd/amdgpu/*.h

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

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,
                 return -EINVAL;
         }
 
-        if (vm && !job->vm_id) {
+        if (vm && !job->vmid) {
                 dev_err(adev->dev, "VM IB without ID\n");
                 return -EINVAL;
         }
@@ -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,8 +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_vmid_reset(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;
         }