Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/amdgpu: assign VM invalidation engine manually v2 



For Vega10 we have 18 VM invalidation engines for each VMHUB.

Start to assign them manually to the rings.

v2: add a BUG_ON if we use to many engines

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarAndres Rodriguez <andresx7@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2e819849

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

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ struct amdgpu_ring { 
	unsigned		cond_exe_offs;

	u64			cond_exe_gpu_addr;

	volatile u32		*cond_exe_cpu_addr;

	unsigned		vm_inv_eng;

#if defined(CONFIG_DEBUG_FS)

	struct dentry *ent;

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -2959,7 +2959,7 @@ static void gfx_v9_0_ring_emit_vm_flush(struct amdgpu_ring *ring, 
	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];

	int usepfp = (ring->funcs->type == AMDGPU_RING_TYPE_GFX);

	uint32_t req = ring->adev->gart.gart_funcs->get_invalidate_req(vm_id);

	unsigned eng = ring->idx;

	unsigned eng = ring->vm_inv_eng;



	pd_addr = pd_addr | 0x1; /* valid bit */

	/* now only use physical base address of PDE and valid */

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

+16 −0
Original line number Diff line number Diff line
@@ -386,6 +386,22 @@ static int gmc_v9_0_early_init(void *handle) 
static int gmc_v9_0_late_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	unsigned vm_inv_eng[AMDGPU_MAX_VMHUBS] = { 0 };

	unsigned i;



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

		struct amdgpu_ring *ring = adev->rings[i];

		unsigned vmhub = ring->funcs->vmhub;



		ring->vm_inv_eng = vm_inv_eng[vmhub]++;

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

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

	}



	/* Engine 17 is used for GART flushes */

	for(i = 0; i < AMDGPU_MAX_VMHUBS; ++i)

		BUG_ON(vm_inv_eng[i] > 17);



	return amdgpu_irq_get(adev, &adev->mc.vm_fault, 0);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ static void sdma_v4_0_ring_emit_vm_flush(struct amdgpu_ring *ring, 
{

	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];

	uint32_t req = ring->adev->gart.gart_funcs->get_invalidate_req(vm_id);

	unsigned eng = ring->idx;

	unsigned eng = ring->vm_inv_eng;



	pd_addr = pd_addr | 0x1; /* valid bit */

	/* now only use physical base address of PDE and valid */

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

+2 −2
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static void uvd_v7_0_ring_emit_vm_flush(struct amdgpu_ring *ring, 
	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];

	uint32_t req = ring->adev->gart.gart_funcs->get_invalidate_req(vm_id);

	uint32_t data0, data1, mask;

	unsigned eng = ring->idx;

	unsigned eng = ring->vm_inv_eng;



	pd_addr = pd_addr | 0x1; /* valid bit */

	/* now only use physical base address of PDE and valid */
@@ -1078,7 +1078,7 @@ static void uvd_v7_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, 
{

	struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];

	uint32_t req = ring->adev->gart.gart_funcs->get_invalidate_req(vm_id);

	unsigned eng = ring->idx;

	unsigned eng = ring->vm_inv_eng;



	pd_addr = pd_addr | 0x1; /* valid bit */

	/* now only use physical base address of PDE and valid */