Commit b2d13a41 authored by Philip Yang's avatar Philip Yang Committed by Alex Deucher
Browse files

drm/amdgpu: GFX12.1 scratch memory limit up to 57-bit 



The scratch aperture or gmc private aperture in flat memory contains
57 bits of data on gfx v12.1.0 compared to the 32 bits from previous.

Add new helper kfd_init_apertures_v12 for gfx version >= v12.1.0 which
supports 57-bit VA space.

v2:
  - update pdd->scratch_limit (Yu, Lang)
  - update fixes tag (Felix Kuehling)
  - add helper kfd_init_apertures_v12

Fixes: db1882b3 ("drm/amdkfd: Update LDS, Scratch base for 57bit address")
Signed-off-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Reviewed-by: default avatarLang Yu <lang.yu@amd.com>
Acked-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 89b814a3

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

+1 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,7 @@ static void gfx_v12_1_xcc_init_compute_vmid(struct amdgpu_device *adev, 
	/*

	 * Configure apertures:

	 * LDS:         0x20000000'00000000 - 0x20000001'00000000 (4GB)

	 * Scratch:     0x10000000'00000000 - 0x10000001'00000000 (4GB)

	 * Scratch:     0x10000000'00000000 - 0x11ffffff'ffffffff (128PB 57-bit)

	 */

	sh_mem_bases = REG_SET_FIELD(0, SH_MEM_BASES, PRIVATE_BASE,

				     (adev->gmc.private_aperture_start >> 58));

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

+8 −2
Original line number Diff line number Diff line
@@ -654,9 +654,15 @@ static int gmc_v12_0_early_init(struct amdgpu_ip_block *ip_block) 
	adev->gmc.shared_aperture_start = 0x2000000000000000ULL;

	adev->gmc.shared_aperture_end =

		adev->gmc.shared_aperture_start + (4ULL << 30) - 1;



	adev->gmc.private_aperture_start = 0x1000000000000000ULL;

	if (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(12, 1, 0))

		adev->gmc.private_aperture_end =

			adev->gmc.private_aperture_start + (1ULL << 57) - 1;

	else

		adev->gmc.private_aperture_end =

			adev->gmc.private_aperture_start + (4ULL << 30) - 1;



	adev->gmc.noretry_flags = AMDGPU_VM_NORETRY_FLAGS_TF;



	return 0;

drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c

+25 −10
Original line number Diff line number Diff line
@@ -342,9 +342,6 @@ static void kfd_init_apertures_vi(struct kfd_process_device *pdd, uint8_t id) 


static void kfd_init_apertures_v9(struct kfd_process_device *pdd, uint8_t id)

{

	if (KFD_GC_VERSION(pdd->dev) >= IP_VERSION(12, 1, 0))

		pdd->lds_base = pdd->dev->adev->gmc.shared_aperture_start;

	else

	pdd->lds_base = MAKE_LDS_APP_BASE_V9();

	pdd->lds_limit = MAKE_LDS_APP_LIMIT(pdd->lds_base);
@@ -352,9 +349,6 @@ static void kfd_init_apertures_v9(struct kfd_process_device *pdd, uint8_t id) 
	pdd->gpuvm_limit =

		pdd->dev->kfd->shared_resources.gpuvm_size - 1;



	if (KFD_GC_VERSION(pdd->dev) >= IP_VERSION(12, 1, 0))

		pdd->scratch_base = pdd->dev->adev->gmc.private_aperture_start;

	else

	pdd->scratch_base = MAKE_SCRATCH_APP_BASE_V9();

	pdd->scratch_limit = MAKE_SCRATCH_APP_LIMIT(pdd->scratch_base);
@@ -365,6 +359,25 @@ static void kfd_init_apertures_v9(struct kfd_process_device *pdd, uint8_t id) 
	pdd->qpd.cwsr_base = AMDGPU_VA_RESERVED_TRAP_START(pdd->dev->adev);

}



static void kfd_init_apertures_v12(struct kfd_process_device *pdd, uint8_t id)

{

	pdd->lds_base = pdd->dev->adev->gmc.shared_aperture_start;

	pdd->lds_limit = pdd->dev->adev->gmc.shared_aperture_end;



	pdd->gpuvm_base = AMDGPU_VA_RESERVED_BOTTOM;

	pdd->gpuvm_limit =

		pdd->dev->kfd->shared_resources.gpuvm_size - 1;



	pdd->scratch_base = pdd->dev->adev->gmc.private_aperture_start;

	pdd->scratch_limit = pdd->dev->adev->gmc.private_aperture_end;



	/*

	 * Place TBA/TMA on opposite side of VM hole to prevent

	 * stray faults from triggering SVM on these pages.

	 */

	pdd->qpd.cwsr_base = AMDGPU_VA_RESERVED_TRAP_START(pdd->dev->adev);

}



int kfd_init_apertures(struct kfd_process *process)

{

	uint8_t id  = 0;
@@ -412,9 +425,11 @@ int kfd_init_apertures(struct kfd_process *process) 
				kfd_init_apertures_vi(pdd, id);

				break;

			default:

				if (KFD_GC_VERSION(dev) >= IP_VERSION(9, 0, 1))

				if (KFD_GC_VERSION(dev) >= IP_VERSION(12, 1, 0)) {

					kfd_init_apertures_v12(pdd, id);

				} else if (KFD_GC_VERSION(dev) >= IP_VERSION(9, 0, 1)) {

					kfd_init_apertures_v9(pdd, id);

				else {

				} else {

					WARN(1, "Unexpected ASIC family %u",

					     dev->adev->asic_type);

					return -EINVAL;