Commit e715c6d0 authored by Shaoyun Liu's avatar Shaoyun Liu Committed by Alex Deucher
Browse files

drm/amd: Interface change to support 64 bit page_table_base 



amdgpu_gpuvm_get_process_page_dir should return the page table address
in the format expected by the pm4_map_process packet for all ASIC
generations.

Signed-off-by: default avatarShaoyun Liu <Shaoyun.Liu@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d5094189

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

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev, 
				struct amdgpu_vm *vm);

void amdgpu_amdkfd_gpuvm_destroy_process_vm(struct kgd_dev *kgd, void *vm);

void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *vm);

uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm);

uint64_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm);

int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(

		struct kgd_dev *kgd, uint64_t va, uint64_t size,

		void *vm, struct kgd_mem **mem,

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

+4 −3
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type); 
static void set_scratch_backing_va(struct kgd_dev *kgd,

					uint64_t va, uint32_t vmid);

static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint32_t page_table_base);

		uint64_t page_table_base);

static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid);

static int invalidate_tlbs_vmid(struct kgd_dev *kgd, uint16_t vmid);

static uint32_t read_vmid_from_vmfault_reg(struct kgd_dev *kgd);
@@ -874,7 +874,7 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type) 
}



static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

			uint32_t page_table_base)

			uint64_t page_table_base)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);
@@ -882,7 +882,8 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, 
		pr_err("trying to set page table base for wrong VMID\n");

		return;

	}

	WREG32(mmVM_CONTEXT8_PAGE_TABLE_BASE_ADDR + vmid - 8, page_table_base);

	WREG32(mmVM_CONTEXT8_PAGE_TABLE_BASE_ADDR + vmid - 8,

		lower_32_bits(page_table_base));

}



static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid)

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

+4 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type); 
static void set_scratch_backing_va(struct kgd_dev *kgd,

					uint64_t va, uint32_t vmid);

static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint32_t page_table_base);

		uint64_t page_table_base);

static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid);

static int invalidate_tlbs_vmid(struct kgd_dev *kgd, uint16_t vmid);
@@ -833,7 +833,7 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type) 
}



static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint32_t page_table_base)

		uint64_t page_table_base)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);
@@ -841,7 +841,8 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, 
		pr_err("trying to set page table base for wrong VMID\n");

		return;

	}

	WREG32(mmVM_CONTEXT8_PAGE_TABLE_BASE_ADDR + vmid - 8, page_table_base);

	WREG32(mmVM_CONTEXT8_PAGE_TABLE_BASE_ADDR + vmid - 8,

			lower_32_bits(page_table_base));

}



static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid)

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

+3 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static bool get_atc_vmid_pasid_mapping_valid(struct kgd_dev *kgd, 
static uint16_t get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd,

		uint8_t vmid);

static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint32_t page_table_base);

		uint64_t page_table_base);

static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type);

static void set_scratch_backing_va(struct kgd_dev *kgd,

					uint64_t va, uint32_t vmid);
@@ -1013,11 +1013,10 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type) 
}



static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid,

		uint32_t page_table_base)

		uint64_t page_table_base)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	uint64_t base = (uint64_t)page_table_base << PAGE_SHIFT |

		AMDGPU_PTE_VALID;

	uint64_t base = page_table_base | AMDGPU_PTE_VALID;



	if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid)) {

		pr_err("trying to set page table base for wrong VMID %u\n",

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

+6 −2
Original line number Diff line number Diff line
@@ -1131,11 +1131,15 @@ void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *vm) 
	amdgpu_vm_release_compute(adev, avm);

}



uint32_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm)

uint64_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *vm)

{

	struct amdgpu_vm *avm = (struct amdgpu_vm *)vm;

	struct amdgpu_bo *pd = avm->root.base.bo;

	struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);



	if (adev->asic_type < CHIP_VEGA10)

		return avm->pd_phys_addr >> AMDGPU_GPU_PAGE_SHIFT;

	return avm->pd_phys_addr;

}



int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu(

CRA Git | Maintained and supported by SUSTech CRA and CCSE