Commit c4f46f22 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 620f774f

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+3 −3
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ struct amdgpu_gart_funcs { 
	/* get the pde for a given mc addr */

	void (*get_vm_pde)(struct amdgpu_device *adev, int level,

			   u64 *dst, u64 *flags);

	uint32_t (*get_invalidate_req)(unsigned int vm_id);

	uint32_t (*get_invalidate_req)(unsigned int vmid);

};



/* provided by the ih block */
@@ -1124,7 +1124,7 @@ struct amdgpu_job { 
	void			*owner;

	uint64_t		fence_ctx; /* the fence_context this job uses */

	bool                    vm_needs_flush;

	unsigned		vm_id;

	unsigned		vmid;

	uint64_t		vm_pd_addr;

	uint32_t		gds_base, gds_size;

	uint32_t		gws_base, gws_size;
@@ -1849,7 +1849,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))

#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))

#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

#define amdgpu_ring_emit_ib(r, ib, vm_id, c) (r)->funcs->emit_ib((r), (ib), (vm_id), (c))

#define amdgpu_ring_emit_ib(r, ib, vmid, c) (r)->funcs->emit_ib((r), (ib), (vmid), (c))

#define amdgpu_ring_emit_pipeline_sync(r) (r)->funcs->emit_pipeline_sync((r))

#define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr))

#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c

+3 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int amdgpu_vmid_grab_reserved_locked(struct amdgpu_vm *vm, 
		dma_fence_put(id->last_flush);

		id->last_flush = NULL;

	}

	job->vm_id = id - id_mgr->ids;

	job->vmid = id - id_mgr->ids;

	trace_amdgpu_vm_grab_id(vm, ring, job);

out:

	return r;
@@ -301,7 +301,7 @@ needs_flush: 
no_flush_needed:

	list_move_tail(&id->list, &id_mgr->ids_lru);



	job->vm_id = id - id_mgr->ids;

	job->vmid = id - id_mgr->ids;

	trace_amdgpu_vm_grab_id(vm, ring, job);



error:
@@ -360,7 +360,7 @@ void amdgpu_vmid_free_reserved(struct amdgpu_device *adev, 
 * amdgpu_vmid_reset - reset VMID to zero

 *

 * @adev: amdgpu device structure

 * @vm_id: vmid number to use

 * @vmid: vmid number to use

 *

 * Reset saved GDW, GWS and OA to force switch on next flush.

 */

drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ struct amdgpu_iv_entry { 
	unsigned client_id;

	unsigned src_id;

	unsigned ring_id;

	unsigned vm_id;

	unsigned vm_id_src;

	unsigned vmid;

	unsigned vmid_src;

	uint64_t timestamp;

	unsigned timestamp_src;

	unsigned pas_id;

drivers/gpu/drm/amd/amdgpu/amdgpu_job.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static struct dma_fence *amdgpu_job_dependency(struct drm_sched_job *sched_job, 
		}

	}



	while (fence == NULL && vm && !job->vm_id) {

	while (fence == NULL && vm && !job->vmid) {

		struct amdgpu_ring *ring = job->ring;



		r = amdgpu_vmid_grab(vm, ring, &job->sync,

CRA Git | Maintained and supported by SUSTech CRA and CCSE