* [PATCH v2] drm/amdkfd: Add proper prefix to functions
@ 2018-10-19 15:15 Lin, Amber
[not found] ` <1539962124-21771-1-git-send-email-Amber.Lin-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Lin, Amber @ 2018-10-19 15:15 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Lin, Amber
Add amdgpu_amdkfd_ prefix to amdgpu functions served for amdkfd usage.
v2: fix indentation
Signed-off-by: Amber Lin <Amber.Lin@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 18 +++++++++---------
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 20 ++++++++++----------
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ++--
drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 ++--
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +++---
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 4 ++--
drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 8 ++++----
8 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index c31a884..bce5f77 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -268,9 +268,9 @@ 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,
- void **mem_obj, uint64_t *gpu_addr,
- void **cpu_ptr, bool mqd_gfx9)
+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)
{
struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
struct amdgpu_bo *bo = NULL;
@@ -340,7 +340,7 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
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,8 +351,8 @@ void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj)
amdgpu_bo_unref(&(bo));
}
-void get_local_mem_info(struct kgd_dev *kgd,
- struct kfd_local_mem_info *mem_info)
+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;
uint64_t address_mask = adev->dev->dma_mask ? ~*adev->dev->dma_mask :
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 8e0d4f7..bcf587b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -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,
- 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,
- struct kfd_local_mem_info *mem_info);
-uint64_t 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);
+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 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 amdgpu_amdkfd_get_gpu_clock_counter(struct kgd_dev *kgd);
+
+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);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 85e833d..5f4062b 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
index a48be99..3783d12 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
@@ -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);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
index eeb42af..d7e0f41 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
@@ -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 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
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);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
index 2708070..6910028 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
@@ -59,7 +59,7 @@ void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,
uint32_t cu_per_sh[4] = {0};
int i, se, cu = 0;
- get_cu_info(mm->dev->kgd, &cu_info);
+ amdgpu_amdkfd_get_cu_info(mm->dev->kgd, &cu_info);
if (cu_mask_count > cu_info.cu_active_number)
cu_mask_count = cu_info.cu_active_number;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
index db3b195..9dbba60 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
@@ -84,7 +84,7 @@ static int init_mqd(struct mqd_manager *mm, void **mqd,
*mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);
if (!*mqd_mem_obj)
return -ENOMEM;
- retval = alloc_gtt_mem(kfd->kgd,
+ retval = amdgpu_amdkfd_alloc_gtt_mem(kfd->kgd,
ALIGN(q->ctl_stack_size, PAGE_SIZE) +
ALIGN(sizeof(struct v9_mqd), PAGE_SIZE),
&((*mqd_mem_obj)->gtt_mem),
@@ -251,7 +251,7 @@ static void uninit_mqd(struct mqd_manager *mm, void *mqd,
struct kfd_dev *kfd = mm->dev;
if (mqd_mem_obj->gtt_mem) {
- free_gtt_mem(kfd->kgd, mqd_mem_obj->gtt_mem);
+ amdgpu_amdkfd_free_gtt_mem(kfd->kgd, mqd_mem_obj->gtt_mem);
kfree(mqd_mem_obj);
} else {
kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 6f73101..c73b4ff 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1053,7 +1053,7 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu)
if (!gpu)
return 0;
- get_local_mem_info(gpu->kgd, &local_mem_info);
+ amdgpu_amdkfd_get_local_mem_info(gpu->kgd, &local_mem_info);
local_mem_size = local_mem_info.local_mem_size_private +
local_mem_info.local_mem_size_public;
@@ -1119,7 +1119,7 @@ static void kfd_fill_mem_clk_max_info(struct kfd_topology_device *dev)
* for APUs - If CRAT from ACPI reports more than one bank, then
* all the banks will report the same mem_clk_max information
*/
- get_local_mem_info(dev->gpu->kgd, &local_mem_info);
+ amdgpu_amdkfd_get_local_mem_info(dev->gpu->kgd, &local_mem_info);
list_for_each_entry(mem, &dev->mem_props, list)
mem->mem_clk_max = local_mem_info.mem_clk_max;
@@ -1240,7 +1240,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
* needed for the topology
*/
- get_cu_info(dev->gpu->kgd, &cu_info);
+ amdgpu_amdkfd_get_cu_info(dev->gpu->kgd, &cu_info);
dev->node_props.simd_arrays_per_engine =
cu_info.num_shader_arrays_per_engine;
@@ -1249,7 +1249,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
dev->node_props.location_id = PCI_DEVID(gpu->pdev->bus->number,
gpu->pdev->devfn);
dev->node_props.max_engine_clk_fcompute =
- get_max_engine_clock_in_mhz(dev->gpu->kgd);
+ amdgpu_amdkfd_get_max_engine_clock_in_mhz(dev->gpu->kgd);
dev->node_props.max_engine_clk_ccompute =
cpufreq_quick_get_max(0) / 1000;
dev->node_props.drm_render_minor =
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm/amdkfd: Add proper prefix to functions
[not found] ` <1539962124-21771-1-git-send-email-Amber.Lin-5C7GfCeVMHo@public.gmane.org>
@ 2018-10-19 16:29 ` Christian König
2018-10-19 21:35 ` Kuehling, Felix
1 sibling, 0 replies; 3+ messages in thread
From: Christian König @ 2018-10-19 16:29 UTC (permalink / raw)
To: Lin, Amber, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 19.10.18 um 17:15 schrieb Lin, Amber:
> Add amdgpu_amdkfd_ prefix to amdgpu functions served for amdkfd usage.
>
> v2: fix indentation
>
> Signed-off-by: Amber Lin <Amber.Lin@amd.com>
Nice cleanup, Acked-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 18 +++++++++---------
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 20 ++++++++++----------
> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ++--
> drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 ++--
> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +++---
> drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 4 ++--
> drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 8 ++++----
> 8 files changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index c31a884..bce5f77 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -268,9 +268,9 @@ 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,
> - void **mem_obj, uint64_t *gpu_addr,
> - void **cpu_ptr, bool mqd_gfx9)
> +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)
> {
> struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
> struct amdgpu_bo *bo = NULL;
> @@ -340,7 +340,7 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
> 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,8 +351,8 @@ void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj)
> amdgpu_bo_unref(&(bo));
> }
>
> -void get_local_mem_info(struct kgd_dev *kgd,
> - struct kfd_local_mem_info *mem_info)
> +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;
> uint64_t address_mask = adev->dev->dma_mask ? ~*adev->dev->dma_mask :
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 8e0d4f7..bcf587b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -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,
> - 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,
> - struct kfd_local_mem_info *mem_info);
> -uint64_t 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);
> +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 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 amdgpu_amdkfd_get_gpu_clock_counter(struct kgd_dev *kgd);
> +
> +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);
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index 85e833d..5f4062b 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> index a48be99..3783d12 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> @@ -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);
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index eeb42af..d7e0f41 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -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 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
> 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);
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> index 2708070..6910028 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> @@ -59,7 +59,7 @@ void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,
> uint32_t cu_per_sh[4] = {0};
> int i, se, cu = 0;
>
> - get_cu_info(mm->dev->kgd, &cu_info);
> + amdgpu_amdkfd_get_cu_info(mm->dev->kgd, &cu_info);
>
> if (cu_mask_count > cu_info.cu_active_number)
> cu_mask_count = cu_info.cu_active_number;
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> index db3b195..9dbba60 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> @@ -84,7 +84,7 @@ static int init_mqd(struct mqd_manager *mm, void **mqd,
> *mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);
> if (!*mqd_mem_obj)
> return -ENOMEM;
> - retval = alloc_gtt_mem(kfd->kgd,
> + retval = amdgpu_amdkfd_alloc_gtt_mem(kfd->kgd,
> ALIGN(q->ctl_stack_size, PAGE_SIZE) +
> ALIGN(sizeof(struct v9_mqd), PAGE_SIZE),
> &((*mqd_mem_obj)->gtt_mem),
> @@ -251,7 +251,7 @@ static void uninit_mqd(struct mqd_manager *mm, void *mqd,
> struct kfd_dev *kfd = mm->dev;
>
> if (mqd_mem_obj->gtt_mem) {
> - free_gtt_mem(kfd->kgd, mqd_mem_obj->gtt_mem);
> + amdgpu_amdkfd_free_gtt_mem(kfd->kgd, mqd_mem_obj->gtt_mem);
> kfree(mqd_mem_obj);
> } else {
> kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index 6f73101..c73b4ff 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> @@ -1053,7 +1053,7 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu)
> if (!gpu)
> return 0;
>
> - get_local_mem_info(gpu->kgd, &local_mem_info);
> + amdgpu_amdkfd_get_local_mem_info(gpu->kgd, &local_mem_info);
>
> local_mem_size = local_mem_info.local_mem_size_private +
> local_mem_info.local_mem_size_public;
> @@ -1119,7 +1119,7 @@ static void kfd_fill_mem_clk_max_info(struct kfd_topology_device *dev)
> * for APUs - If CRAT from ACPI reports more than one bank, then
> * all the banks will report the same mem_clk_max information
> */
> - get_local_mem_info(dev->gpu->kgd, &local_mem_info);
> + amdgpu_amdkfd_get_local_mem_info(dev->gpu->kgd, &local_mem_info);
>
> list_for_each_entry(mem, &dev->mem_props, list)
> mem->mem_clk_max = local_mem_info.mem_clk_max;
> @@ -1240,7 +1240,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
> * needed for the topology
> */
>
> - get_cu_info(dev->gpu->kgd, &cu_info);
> + amdgpu_amdkfd_get_cu_info(dev->gpu->kgd, &cu_info);
> dev->node_props.simd_arrays_per_engine =
> cu_info.num_shader_arrays_per_engine;
>
> @@ -1249,7 +1249,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
> dev->node_props.location_id = PCI_DEVID(gpu->pdev->bus->number,
> gpu->pdev->devfn);
> dev->node_props.max_engine_clk_fcompute =
> - get_max_engine_clock_in_mhz(dev->gpu->kgd);
> + amdgpu_amdkfd_get_max_engine_clock_in_mhz(dev->gpu->kgd);
> dev->node_props.max_engine_clk_ccompute =
> cpufreq_quick_get_max(0) / 1000;
> dev->node_props.drm_render_minor =
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm/amdkfd: Add proper prefix to functions
[not found] ` <1539962124-21771-1-git-send-email-Amber.Lin-5C7GfCeVMHo@public.gmane.org>
2018-10-19 16:29 ` Christian König
@ 2018-10-19 21:35 ` Kuehling, Felix
1 sibling, 0 replies; 3+ messages in thread
From: Kuehling, Felix @ 2018-10-19 21:35 UTC (permalink / raw)
To: Lin, Amber, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On 2018-10-19 11:15 a.m., Lin, Amber wrote:
> Add amdgpu_amdkfd_ prefix to amdgpu functions served for amdkfd usage.
>
> v2: fix indentation
>
> Signed-off-by: Amber Lin <Amber.Lin@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 18 +++++++++---------
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 20 ++++++++++----------
> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ++--
> drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 ++--
> drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +++---
> drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +-
> drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 4 ++--
> drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 8 ++++----
> 8 files changed, 33 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index c31a884..bce5f77 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -268,9 +268,9 @@ 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,
> - void **mem_obj, uint64_t *gpu_addr,
> - void **cpu_ptr, bool mqd_gfx9)
> +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)
> {
> struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
> struct amdgpu_bo *bo = NULL;
> @@ -340,7 +340,7 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
> 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,8 +351,8 @@ void free_gtt_mem(struct kgd_dev *kgd, void *mem_obj)
> amdgpu_bo_unref(&(bo));
> }
>
> -void get_local_mem_info(struct kgd_dev *kgd,
> - struct kfd_local_mem_info *mem_info)
> +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;
> uint64_t address_mask = adev->dev->dma_mask ? ~*adev->dev->dma_mask :
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 8e0d4f7..bcf587b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -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,
> - 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,
> - struct kfd_local_mem_info *mem_info);
> -uint64_t 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);
> +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 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 amdgpu_amdkfd_get_gpu_clock_counter(struct kgd_dev *kgd);
> +
> +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);
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index 85e833d..5f4062b 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> index a48be99..3783d12 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c
> @@ -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);
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> index eeb42af..d7e0f41 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
> @@ -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 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
> 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);
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> index 2708070..6910028 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> @@ -59,7 +59,7 @@ void mqd_symmetrically_map_cu_mask(struct mqd_manager *mm,
> uint32_t cu_per_sh[4] = {0};
> int i, se, cu = 0;
>
> - get_cu_info(mm->dev->kgd, &cu_info);
> + amdgpu_amdkfd_get_cu_info(mm->dev->kgd, &cu_info);
>
> if (cu_mask_count > cu_info.cu_active_number)
> cu_mask_count = cu_info.cu_active_number;
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> index db3b195..9dbba60 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
> @@ -84,7 +84,7 @@ static int init_mqd(struct mqd_manager *mm, void **mqd,
> *mqd_mem_obj = kzalloc(sizeof(struct kfd_mem_obj), GFP_KERNEL);
> if (!*mqd_mem_obj)
> return -ENOMEM;
> - retval = alloc_gtt_mem(kfd->kgd,
> + retval = amdgpu_amdkfd_alloc_gtt_mem(kfd->kgd,
> ALIGN(q->ctl_stack_size, PAGE_SIZE) +
> ALIGN(sizeof(struct v9_mqd), PAGE_SIZE),
> &((*mqd_mem_obj)->gtt_mem),
> @@ -251,7 +251,7 @@ static void uninit_mqd(struct mqd_manager *mm, void *mqd,
> struct kfd_dev *kfd = mm->dev;
>
> if (mqd_mem_obj->gtt_mem) {
> - free_gtt_mem(kfd->kgd, mqd_mem_obj->gtt_mem);
> + amdgpu_amdkfd_free_gtt_mem(kfd->kgd, mqd_mem_obj->gtt_mem);
> kfree(mqd_mem_obj);
> } else {
> kfd_gtt_sa_free(mm->dev, mqd_mem_obj);
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index 6f73101..c73b4ff 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> @@ -1053,7 +1053,7 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu)
> if (!gpu)
> return 0;
>
> - get_local_mem_info(gpu->kgd, &local_mem_info);
> + amdgpu_amdkfd_get_local_mem_info(gpu->kgd, &local_mem_info);
>
> local_mem_size = local_mem_info.local_mem_size_private +
> local_mem_info.local_mem_size_public;
> @@ -1119,7 +1119,7 @@ static void kfd_fill_mem_clk_max_info(struct kfd_topology_device *dev)
> * for APUs - If CRAT from ACPI reports more than one bank, then
> * all the banks will report the same mem_clk_max information
> */
> - get_local_mem_info(dev->gpu->kgd, &local_mem_info);
> + amdgpu_amdkfd_get_local_mem_info(dev->gpu->kgd, &local_mem_info);
>
> list_for_each_entry(mem, &dev->mem_props, list)
> mem->mem_clk_max = local_mem_info.mem_clk_max;
> @@ -1240,7 +1240,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
> * needed for the topology
> */
>
> - get_cu_info(dev->gpu->kgd, &cu_info);
> + amdgpu_amdkfd_get_cu_info(dev->gpu->kgd, &cu_info);
> dev->node_props.simd_arrays_per_engine =
> cu_info.num_shader_arrays_per_engine;
>
> @@ -1249,7 +1249,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
> dev->node_props.location_id = PCI_DEVID(gpu->pdev->bus->number,
> gpu->pdev->devfn);
> dev->node_props.max_engine_clk_fcompute =
> - get_max_engine_clock_in_mhz(dev->gpu->kgd);
> + amdgpu_amdkfd_get_max_engine_clock_in_mhz(dev->gpu->kgd);
> dev->node_props.max_engine_clk_ccompute =
> cpufreq_quick_get_max(0) / 1000;
> dev->node_props.drm_render_minor =
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-19 21:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-19 15:15 [PATCH v2] drm/amdkfd: Add proper prefix to functions Lin, Amber
[not found] ` <1539962124-21771-1-git-send-email-Amber.Lin-5C7GfCeVMHo@public.gmane.org>
2018-10-19 16:29 ` Christian König
2018-10-19 21:35 ` Kuehling, Felix
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.