Commit 0530553b authored by Le Ma's avatar Le Ma Committed by Alex Deucher
Browse files

drm/amdgpu: move vmhub out of amdgpu_ring_funcs (v4) 



It looks better to place this field in ring
structure. Also drop the repeated ring funcs definitions
if there's no difference except for vmhub field.

v2: rename the field to vm_hub like others (Le)
v3: apply the changes to new ip blocks (Hawking)
v4: fix vcn sw ring (Alex)

Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b805d8d7

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

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev, 
	ring->ring_obj = NULL;

	ring->use_doorbell = true;

	ring->doorbell_index = adev->doorbell_index.kiq;

	ring->vm_hub = AMDGPU_GFXHUB_0;



	r = amdgpu_gfx_kiq_acquire(adev, ring);

	if (r)

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

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev) 


	for (i = 0; i < adev->num_rings; ++i) {

		ring = adev->rings[i];

		vmhub = ring->funcs->vmhub;

		vmhub = ring->vm_hub;



		if (ring == &adev->mes.ring)

			continue;
@@ -570,7 +570,7 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev) 
		vm_inv_engs[vmhub] &= ~(1 << ring->vm_inv_eng);



		dev_info(adev->dev, "ring %s uses VM inv eng %u on hub %u\n",

			 ring->name, ring->vm_inv_eng, ring->funcs->vmhub);

			 ring->name, ring->vm_inv_eng, ring->vm_hub);

	}



	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	if (r) {

		dev_err(adev->dev, "failed to emit fence (%d)\n", r);

		if (job && job->vmid)

			amdgpu_vmid_reset(adev, ring->funcs->vmhub, job->vmid);

			amdgpu_vmid_reset(adev, ring->vm_hub, job->vmid);

		amdgpu_ring_undo(ring);

		return r;

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int amdgpu_vmid_grab_idle(struct amdgpu_vm *vm, 
				 struct dma_fence **fence)

{

	struct amdgpu_device *adev = ring->adev;

	unsigned vmhub = ring->funcs->vmhub;

	unsigned vmhub = ring->vm_hub;

	struct amdgpu_vmid_mgr *id_mgr = &adev->vm_manager.id_mgr[vmhub];

	struct dma_fence **fences;

	unsigned i;
@@ -277,7 +277,7 @@ static int amdgpu_vmid_grab_reserved(struct amdgpu_vm *vm, 
				     struct dma_fence **fence)

{

	struct amdgpu_device *adev = ring->adev;

	unsigned vmhub = ring->funcs->vmhub;

	unsigned vmhub = ring->vm_hub;

	struct amdgpu_vmid_mgr *id_mgr = &adev->vm_manager.id_mgr[vmhub];

	uint64_t fence_context = adev->fence_context + ring->idx;

	bool needs_flush = vm->use_cpu_for_update;
@@ -338,7 +338,7 @@ static int amdgpu_vmid_grab_used(struct amdgpu_vm *vm, 
				 struct dma_fence **fence)

{

	struct amdgpu_device *adev = ring->adev;

	unsigned vmhub = ring->funcs->vmhub;

	unsigned vmhub = ring->vm_hub;

	struct amdgpu_vmid_mgr *id_mgr = &adev->vm_manager.id_mgr[vmhub];

	uint64_t fence_context = adev->fence_context + ring->idx;

	uint64_t updates = amdgpu_vm_tlb_seq(vm);
@@ -398,7 +398,7 @@ int amdgpu_vmid_grab(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 
		     struct amdgpu_job *job, struct dma_fence **fence)

{

	struct amdgpu_device *adev = ring->adev;

	unsigned vmhub = ring->funcs->vmhub;

	unsigned vmhub = ring->vm_hub;

	struct amdgpu_vmid_mgr *id_mgr = &adev->vm_manager.id_mgr[vmhub];

	struct amdgpu_vmid *idle = NULL;

	struct amdgpu_vmid *id = NULL;

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

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ struct amdgpu_ring_funcs { 
	bool			support_64bit_ptrs;

	bool			no_user_fence;

	bool			secure_submission_supported;

	unsigned		vmhub;

	unsigned		extra_dw;



	/* ring read/write ptr handling */
@@ -275,6 +274,7 @@ struct amdgpu_ring { 
	unsigned		cond_exe_offs;

	u64			cond_exe_gpu_addr;

	volatile u32		*cond_exe_cpu_addr;

	unsigned		vm_hub;

	unsigned		vm_inv_eng;

	struct dma_fence	*vmid_wait;

	bool			has_compute_vm_bug;