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

drm/amdkfd: Add domain parameter to alloc kernel BO 



To allocate kernel BO from VRAM domain for MQD in the following patch.
No functional change because kernel BO allocate all from GTT domain.

Rename amdgpu_amdkfd_alloc_gtt_mem to amdgpu_amdkfd_alloc_kernel_mem
Rename amdgpu_amdkfd_free_gtt_mem to amdgpu_amdkfd_free_kernel_mem
Rename mem_kfd_mem_obj gtt_mem to mem

Signed-off-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Reviewed-by: default avatarKent Russell <kent.russell@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8e051e38

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

+5 −5
Original line number Diff line number Diff line
@@ -321,8 +321,8 @@ void amdgpu_amdkfd_gpu_reset(struct amdgpu_device *adev) 
					     &adev->kfd.reset_work);

}



int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,

				void **mem_obj, uint64_t *gpu_addr,

int amdgpu_amdkfd_alloc_kernel_mem(struct amdgpu_device *adev, size_t size,

				u32 domain, void **mem_obj, uint64_t *gpu_addr,

				void **cpu_ptr, bool cp_mqd_gfx9)

{

	struct amdgpu_bo *bo = NULL;
@@ -333,7 +333,7 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size, 
	memset(&bp, 0, sizeof(bp));

	bp.size = size;

	bp.byte_align = PAGE_SIZE;

	bp.domain = AMDGPU_GEM_DOMAIN_GTT;

	bp.domain = domain;

	bp.flags = AMDGPU_GEM_CREATE_CPU_GTT_USWC;

	bp.type = ttm_bo_type_kernel;

	bp.resv = NULL;
@@ -356,7 +356,7 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size, 
		goto allocate_mem_reserve_bo_failed;

	}



	r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	r = amdgpu_bo_pin(bo, domain);

	if (r) {

		dev_err(adev->dev, "(%d) failed to pin bo for amdkfd\n", r);

		goto allocate_mem_pin_bo_failed;
@@ -393,7 +393,7 @@ int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size, 
	return r;

}



void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj)

void amdgpu_amdkfd_free_kernel_mem(struct amdgpu_device *adev, void **mem_obj)

{

	struct amdgpu_bo **bo = (struct amdgpu_bo **) mem_obj;

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

+3 −3
Original line number Diff line number Diff line
@@ -241,10 +241,10 @@ int amdgpu_amdkfd_bo_validate_and_fence(struct amdgpu_bo *bo, 
}

#endif

/* Shared API */

int amdgpu_amdkfd_alloc_gtt_mem(struct amdgpu_device *adev, size_t size,

				void **mem_obj, uint64_t *gpu_addr,

int amdgpu_amdkfd_alloc_kernel_mem(struct amdgpu_device *adev, size_t size,

				u32 domain, void **mem_obj, uint64_t *gpu_addr,

				void **cpu_ptr, bool mqd_gfx9);

void amdgpu_amdkfd_free_gtt_mem(struct amdgpu_device *adev, void **mem_obj);

void amdgpu_amdkfd_free_kernel_mem(struct amdgpu_device *adev, void **mem_obj);

int amdgpu_amdkfd_alloc_gws(struct amdgpu_device *adev, size_t size,

				void **mem_obj);

void amdgpu_amdkfd_free_gws(struct amdgpu_device *adev, void *mem_obj);

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

+1 −1
Original line number Diff line number Diff line
@@ -2215,7 +2215,7 @@ int amdgpu_amdkfd_gpuvm_sync_memory( 
 * @bo_gart: Return bo reference

 *

 * Before return, bo reference count is incremented. To release the reference and unpin/

 * unmap the BO, call amdgpu_amdkfd_free_gtt_mem.

 * unmap the BO, call amdgpu_amdkfd_free_kernel_mem.

 */

int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_bo *bo, struct amdgpu_bo **bo_gart)

{

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

+2 −1
Original line number Diff line number Diff line
@@ -357,8 +357,9 @@ int kfd_dbg_set_mes_debug_mode(struct kfd_process_device *pdd, bool sq_trap_en) 
		return 0;



	if (!pdd->proc_ctx_cpu_ptr) {

		r = amdgpu_amdkfd_alloc_gtt_mem(adev,

		r = amdgpu_amdkfd_alloc_kernel_mem(adev,

			AMDGPU_MES_PROC_CTX_SIZE,

			AMDGPU_GEM_DOMAIN_GTT,

			&pdd->proc_ctx_bo,

			&pdd->proc_ctx_gpu_addr,

			&pdd->proc_ctx_cpu_ptr,

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

+7 −6
Original line number Diff line number Diff line
@@ -820,12 +820,13 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
	/* add another 512KB for all other allocations on gart (HPD, fences) */

	size += 512 * 1024;



	if (amdgpu_amdkfd_alloc_gtt_mem(

			kfd->adev, size, &kfd->gtt_mem,

	if (amdgpu_amdkfd_alloc_kernel_mem(

			kfd->adev, size, AMDGPU_GEM_DOMAIN_GTT,

			&kfd->gtt_mem,

			&kfd->gtt_start_gpu_addr, &kfd->gtt_start_cpu_ptr,

			false)) {

		dev_err(kfd_device, "Could not allocate %d bytes\n", size);

		goto alloc_gtt_mem_failure;

		goto alloc_kernel_mem_failure;

	}



	dev_info(kfd_device, "Allocated %d bytes on gart\n", size);
@@ -951,8 +952,8 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
kfd_doorbell_error:

	kfd_gtt_sa_fini(kfd);

kfd_gtt_sa_init_error:

	amdgpu_amdkfd_free_gtt_mem(kfd->adev, &kfd->gtt_mem);

alloc_gtt_mem_failure:

	amdgpu_amdkfd_free_kernel_mem(kfd->adev, &kfd->gtt_mem);

alloc_kernel_mem_failure:

	dev_err(kfd_device,

		"device %x:%x NOT added due to errors\n",

		kfd->adev->pdev->vendor, kfd->adev->pdev->device);
@@ -969,7 +970,7 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd) 
		kfd_doorbell_fini(kfd);

		ida_destroy(&kfd->doorbell_ida);

		kfd_gtt_sa_fini(kfd);

		amdgpu_amdkfd_free_gtt_mem(kfd->adev, &kfd->gtt_mem);

		amdgpu_amdkfd_free_kernel_mem(kfd->adev, &kfd->gtt_mem);

	}



	kfree(kfd);