Commit 7cd52c91 authored by Amber Lin's avatar Amber Lin Committed by Alex Deucher
Browse files

drm/amdkfd: Add proper prefix to functions 



Add amdgpu_amdkfd_ prefix to amdgpu functions served for amdkfd usage.

v2: fix indentation

Signed-off-by: default avatarAmber Lin <Amber.Lin@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dfcbe6d5

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

+9 −9
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd) 
		amdgpu_device_gpu_recover(adev, NULL);

}



int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

				void **mem_obj, uint64_t *gpu_addr,

				void **cpu_ptr, bool mqd_gfx9)

{
@@ -340,7 +340,7 @@ allocate_mem_reserve_bo_failed: 
	return r;

}



void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj)

void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void *mem_obj)

{

	struct amdgpu_bo *bo = (struct amdgpu_bo *) mem_obj;
@@ -351,7 +351,7 @@ void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj) 
	amdgpu_bo_unref(&(bo));

}



void get_local_mem_info(struct kgd_dev *kgd,

void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd,

				      struct kfd_local_mem_info *mem_info)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
@@ -383,7 +383,7 @@ void get_local_mem_info(struct kgd_dev *kgd, 
		mem_info->mem_clk_max = 100;

}



uint64_t get_gpu_clock_counter(struct kgd_dev *kgd)

uint64_t amdgpu_amdkfd_get_gpu_clock_counter(struct kgd_dev *kgd)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
@@ -392,7 +392,7 @@ uint64_t get_gpu_clock_counter(struct kgd_dev *kgd) 
	return 0;

}



uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd)

uint32_t amdgpu_amdkfd_get_max_engine_clock_in_mhz(struct kgd_dev *kgd)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
@@ -405,7 +405,7 @@ uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd) 
		return 100;

}



void get_cu_info(struct kgd_dev *kgd, struct kfd_cu_info *cu_info)

void amdgpu_amdkfd_get_cu_info(struct kgd_dev *kgd, struct kfd_cu_info *cu_info)

{

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

	struct amdgpu_cu_info acu_info = adev->gfx.cu_info;

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

+10 −10
Original line number Diff line number Diff line
@@ -134,16 +134,16 @@ int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev); 
void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd);



/* Shared API */

int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

int amdgpu_amdkfd_alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

				void **mem_obj, uint64_t *gpu_addr,

				void **cpu_ptr, bool mqd_gfx9);

void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj);

void get_local_mem_info(struct kgd_dev *kgd,

void amdgpu_amdkfd_free_gtt_mem(struct kgd_dev *kgd, void *mem_obj);

void amdgpu_amdkfd_get_local_mem_info(struct kgd_dev *kgd,

				      struct kfd_local_mem_info *mem_info);

uint64_t get_gpu_clock_counter(struct kgd_dev *kgd);

uint64_t amdgpu_amdkfd_get_gpu_clock_counter(struct kgd_dev *kgd);



uint32_t get_max_engine_clock_in_mhz(struct kgd_dev *kgd);

void get_cu_info(struct kgd_dev *kgd, struct kfd_cu_info *cu_info);

uint32_t amdgpu_amdkfd_get_max_engine_clock_in_mhz(struct kgd_dev *kgd);

void amdgpu_amdkfd_get_cu_info(struct kgd_dev *kgd, struct kfd_cu_info *cu_info);

uint64_t amdgpu_amdkfd_get_vram_usage(struct kgd_dev *kgd);

uint64_t amdgpu_amdkfd_get_hive_id(struct kgd_dev *kgd);

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

+2 −2
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static int kfd_ioctl_get_clock_counters(struct file *filep, 
	dev = kfd_device_by_id(args->gpu_id);

	if (dev)

		/* Reading GPU clock counter from KGD */

		args->gpu_clock_counter = get_gpu_clock_counter(dev->kgd);

		args->gpu_clock_counter = amdgpu_amdkfd_get_gpu_clock_counter(dev->kgd);

	else

		/* Node without GPU resource */

		args->gpu_clock_counter = 0;
@@ -1240,7 +1240,7 @@ bool kfd_dev_is_large_bar(struct kfd_dev *dev) 
	if (dev->device_info->needs_iommu_device)

		return false;



	get_local_mem_info(dev->kgd, &mem_info);

	amdgpu_amdkfd_get_local_mem_info(dev->kgd, &mem_info);

	if (mem_info.local_mem_size_private == 0 &&

			mem_info.local_mem_size_public > 0)

		return true;

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

+2 −2
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static int kfd_create_vcrat_image_gpu(void *pcrat_image, 
	cu->flags |= CRAT_CU_FLAGS_GPU_PRESENT;

	cu->proximity_domain = proximity_domain;



	get_cu_info(kdev->kgd, &cu_info);

	amdgpu_amdkfd_get_cu_info(kdev->kgd, &cu_info);

	cu->num_simd_per_cu = cu_info.simd_per_cu;

	cu->num_simd_cores = cu_info.simd_per_cu * cu_info.cu_active_number;

	cu->max_waves_simd = cu_info.max_waves_per_simd;
@@ -1191,7 +1191,7 @@ static int kfd_create_vcrat_image_gpu(void *pcrat_image, 
	 * report the total FB size (public+private) as a single

	 * private heap.

	 */

	get_local_mem_info(kdev->kgd, &local_mem_info);

	amdgpu_amdkfd_get_local_mem_info(kdev->kgd, &local_mem_info);

	sub_type_hdr = (typeof(sub_type_hdr))((char *)sub_type_hdr +

			sub_type_hdr->length);

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

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

	size += 512 * 1024;



	if (alloc_gtt_mem(

	if (amdgpu_amdkfd_alloc_gtt_mem(

			kfd->kgd, size, &kfd->gtt_mem,

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

			false)) {
@@ -553,7 +553,7 @@ kfd_topology_add_device_error: 
kfd_doorbell_error:

	kfd_gtt_sa_fini(kfd);

kfd_gtt_sa_init_error:

	free_gtt_mem(kfd->kgd, kfd->gtt_mem);

	amdgpu_amdkfd_free_gtt_mem(kfd->kgd, kfd->gtt_mem);

	dev_err(kfd_device,

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

		kfd->pdev->vendor, kfd->pdev->device);
@@ -570,7 +570,7 @@ void kgd2kfd_device_exit(struct kfd_dev *kfd) 
		kfd_topology_remove_device(kfd);

		kfd_doorbell_fini(kfd);

		kfd_gtt_sa_fini(kfd);

		free_gtt_mem(kfd->kgd, kfd->gtt_mem);

		amdgpu_amdkfd_free_gtt_mem(kfd->kgd, kfd->gtt_mem);

	}



	kfree(kfd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE