github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 19:47:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amdgpu: reduce the full gpu access time in amdgpu_device_init.

Browse Source 
[Why]
function "devm_memremap_pages" in function "kgd2kfd_init_zone_device",
sometimes cost too much time.

[How]
move the function "kgd2kfd_init_zone_device"
after release full gpu access(amdgpu_virt_release_full_gpu).

v2:
improve the coding style.

Signed-off-by: chong li <chongli2@amd.com>
Reviewed-by: Emily Deng <Emily.Deng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
chong li 2025-11-07 11:59:28 +08:00 committed by Alex Deucher
parent ec62b7ded9
commit c71980a3fc
4 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
View File

@ -37,7 +37,7 @@
#include "amdgpu_sync.h" #include "amdgpu_sync.h"
#include "amdgpu_vm.h" #include "amdgpu_vm.h"
#include "amdgpu_xcp.h" #include "amdgpu_xcp.h"
#include "kfd_topology.h"
extern uint64_t amdgpu_amdkfd_total_mem_size; extern uint64_t amdgpu_amdkfd_total_mem_size;
enum TLB_FLUSH_TYPE { enum TLB_FLUSH_TYPE {

8
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@ -3317,7 +3317,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
/* Don't init kfd if whole hive need to be reset during init */ /* Don't init kfd if whole hive need to be reset during init */
if (adev->init_lvl->level != AMDGPU_INIT_LEVEL_MINIMAL_XGMI) { if (adev->init_lvl->level != AMDGPU_INIT_LEVEL_MINIMAL_XGMI) {
kgd2kfd_init_zone_device(adev);
amdgpu_amdkfd_device_init(adev); amdgpu_amdkfd_device_init(adev);
} }
@ -4934,6 +4933,13 @@ int amdgpu_device_init(struct amdgpu_device *adev,
if (adev->init_lvl->level == AMDGPU_INIT_LEVEL_MINIMAL_XGMI) if (adev->init_lvl->level == AMDGPU_INIT_LEVEL_MINIMAL_XGMI)
amdgpu_xgmi_reset_on_init(adev); amdgpu_xgmi_reset_on_init(adev);
/* Don't init kfd if whole hive need to be reset during init */
if (adev->init_lvl->level != AMDGPU_INIT_LEVEL_MINIMAL_XGMI) {
kgd2kfd_init_zone_device(adev);
kfd_update_svm_support_properties(adev);
}
/* /*
* Place those sysfs registering after `late_init`. As some of those * Place those sysfs registering after `late_init`. As some of those
* operations performed in `late_init` might affect the sysfs * operations performed in `late_init` might affect the sysfs

23
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
View File

@ -2404,3 +2404,26 @@ int kfd_debugfs_rls_by_device(struct seq_file *m, void *data)
} }
#endif #endif
void kfd_update_svm_support_properties(struct amdgpu_device *adev)
{
struct kfd_topology_device *dev;
int ret;
down_write(&topology_lock);
list_for_each_entry(dev, &topology_device_list, list) {
if (!dev->gpu || dev->gpu->adev != adev)
continue;
if (KFD_IS_SVM_API_SUPPORTED(adev)) {
dev->node_props.capability |= HSA_CAP_SVMAPI_SUPPORTED;
ret = kfd_topology_update_sysfs();
if (!ret)
sys_props.generation_count++;
else
dev_err(adev->dev, "Failed to update SVM support properties. ret=%d\n", ret);
} else
dev->node_props.capability &= ~HSA_CAP_SVMAPI_SUPPORTED;
}
up_write(&topology_lock);
}

6
drivers/gpu/drm/amd/amdkfd/kfd_topology.h
View File

@ -201,4 +201,10 @@ struct kfd_topology_device *kfd_create_topology_device(
struct list_head *device_list); struct list_head *device_list);
void kfd_release_topology_device_list(struct list_head *device_list); void kfd_release_topology_device_list(struct list_head *device_list);
#if IS_ENABLED(CONFIG_HSA_AMD)
void kfd_update_svm_support_properties(struct amdgpu_device *adev);
#else
static inline void kfd_update_svm_support_properties(struct amdgpu_device *adev) {}
#endif
#endif /* __KFD_TOPOLOGY_H__ */ #endif /* __KFD_TOPOLOGY_H__ */