Commit f4caf584 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: introduce vmhub definition for multi-partition cases (v3) 



v1: Each partition has its own gfxhub or mmhub. adjust
the num of MAX_VMHUBS and the GFXHUB/MMHUB layout (Le)

v2: re-design the AMDGPU_GFXHUB/AMDGPU_MMHUB layout (Le)

v3: apply the gfxhub/mmhub layout to new IPs (Hawking)

v4: fix up gmc11 (Alex)

v5: rebase (Alex)

Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Acked-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 629b8ede

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

+1 −1
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct amdgpu_device *adev, 
		for (i = 0; i < adev->num_vmhubs; i++)

			amdgpu_gmc_flush_gpu_tlb(adev, vmid, i, 0);

	} else {

		amdgpu_gmc_flush_gpu_tlb(adev, vmid, AMDGPU_GFXHUB_0, 0);

		amdgpu_gmc_flush_gpu_tlb(adev, vmid, AMDGPU_GFXHUB(0), 0);

	}



	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev, 
	ring->use_doorbell = true;

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

	ring->xcc_id = xcc_id;

	ring->vm_hub = AMDGPU_GFXHUB_0;

	ring->vm_hub = AMDGPU_GFXHUB(0);

	if (xcc_id >= 1)

		ring->doorbell_index = adev->doorbell_index.xcc1_kiq_start +

					xcc_id - 1;

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

+2 −2
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ void amdgpu_gmc_set_vm_fault_masks(struct amdgpu_device *adev, int hub_type, 
	for (i = 0; i < 16; i++) {

		reg = hub->vm_context0_cntl + hub->ctx_distance * i;



		tmp = (hub_type == AMDGPU_GFXHUB_0) ?

		tmp = (hub_type == AMDGPU_GFXHUB(0)) ?

			RREG32_SOC15_IP(GC, reg) :

			RREG32_SOC15_IP(MMHUB, reg);
@@ -679,7 +679,7 @@ void amdgpu_gmc_set_vm_fault_masks(struct amdgpu_device *adev, int hub_type, 
		else

			tmp &= ~hub->vm_cntx_cntl_vm_fault;



		(hub_type == AMDGPU_GFXHUB_0) ?

		(hub_type == AMDGPU_GFXHUB(0)) ?

			WREG32_SOC15_IP(GC, reg, tmp) :

			WREG32_SOC15_IP(MMHUB, reg, tmp);

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -2374,12 +2374,12 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
	case AMDGPU_VM_OP_RESERVE_VMID:

		/* We only have requirement to reserve vmid from gfxhub */

		r = amdgpu_vmid_alloc_reserved(adev, &fpriv->vm,

					       AMDGPU_GFXHUB_0);

					       AMDGPU_GFXHUB(0));

		if (r)

			return r;

		break;

	case AMDGPU_VM_OP_UNRESERVE_VMID:

		amdgpu_vmid_free_reserved(adev, &fpriv->vm, AMDGPU_GFXHUB_0);

		amdgpu_vmid_free_reserved(adev, &fpriv->vm, AMDGPU_GFXHUB(0));

		break;

	default:

		return -EINVAL;

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

+8 −5
Original line number Diff line number Diff line
@@ -111,11 +111,14 @@ struct amdgpu_mem_stats; 
/* Reserve 4MB VRAM for page tables */

#define AMDGPU_VM_RESERVED_VRAM		(8ULL << 20)



/* max number of VMHUB */

#define AMDGPU_MAX_VMHUBS			3

#define AMDGPU_GFXHUB_0				0

#define AMDGPU_MMHUB_0				1

#define AMDGPU_MMHUB_1				2

/*

 * max number of VMHUB

 * layout: max 8 GFXHUB + 4 MMHUB0 + 1 MMHUB1

 */

#define AMDGPU_MAX_VMHUBS			13

#define AMDGPU_GFXHUB(x)			(x)

#define AMDGPU_MMHUB0(x)			(8 + x)

#define AMDGPU_MMHUB1(x)			(8 + 4 + x)



/* Reserve 2MB at top/bottom of address space for kernel use */

#define AMDGPU_VA_RESERVED_SIZE			(2ULL << 20)