diff options
author | Christian König <christian.koenig@amd.com> | 2017-12-18 11:08:25 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-27 11:34:02 -0500 |
commit | c4f46f22c448ff571eb8fdbe4ab71a25805228d1 (patch) | |
tree | 50d8eafedcb7b1bbc3fa00561101d395d9ec003b /drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | |
parent | 620f774f4687d86c420152309eefb0ef0fcc7e51 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c index 71f8a76d4c10..d24884b419cb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | |||
@@ -150,7 +150,7 @@ static int amdgpu_vmid_grab_reserved_locked(struct amdgpu_vm *vm, | |||
150 | dma_fence_put(id->last_flush); | 150 | dma_fence_put(id->last_flush); |
151 | id->last_flush = NULL; | 151 | id->last_flush = NULL; |
152 | } | 152 | } |
153 | job->vm_id = id - id_mgr->ids; | 153 | job->vmid = id - id_mgr->ids; |
154 | trace_amdgpu_vm_grab_id(vm, ring, job); | 154 | trace_amdgpu_vm_grab_id(vm, ring, job); |
155 | out: | 155 | out: |
156 | return r; | 156 | return r; |
@@ -301,7 +301,7 @@ needs_flush: | |||
301 | no_flush_needed: | 301 | no_flush_needed: |
302 | list_move_tail(&id->list, &id_mgr->ids_lru); | 302 | list_move_tail(&id->list, &id_mgr->ids_lru); |
303 | 303 | ||
304 | job->vm_id = id - id_mgr->ids; | 304 | job->vmid = id - id_mgr->ids; |
305 | trace_amdgpu_vm_grab_id(vm, ring, job); | 305 | trace_amdgpu_vm_grab_id(vm, ring, job); |
306 | 306 | ||
307 | error: | 307 | error: |
@@ -360,7 +360,7 @@ void amdgpu_vmid_free_reserved(struct amdgpu_device *adev, | |||
360 | * amdgpu_vmid_reset - reset VMID to zero | 360 | * amdgpu_vmid_reset - reset VMID to zero |
361 | * | 361 | * |
362 | * @adev: amdgpu device structure | 362 | * @adev: amdgpu device structure |
363 | * @vm_id: vmid number to use | 363 | * @vmid: vmid number to use |
364 | * | 364 | * |
365 | * Reset saved GDW, GWS and OA to force switch on next flush. | 365 | * Reset saved GDW, GWS and OA to force switch on next flush. |
366 | */ | 366 | */ |