drm/amdkfd: Fix getting unique_id in topology
Subsystems (3)
PATCH 1/1 drm/amdkfd: Fix getting unique_id in topology
Since the unique_id is now obtained in amdgpu in smu_late_init, topology misses getting the value during KFD device initialization. To work around this, we use amdgpu_amdkfd_get_unique_id to get the unique_id at read time. Due to this, we can remove unique_id from the kfd_dev structure, since we only need it in the KFD node properties struct
--- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 -- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 --- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +0 -2
@@ -757,8 +757,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, kfd->hive_id =amdgpu_amdkfd_get_hive_id (kfd->kgd); - kfd->unique_id =amdgpu_amdkfd_get_unique_id (kfd->kgd); - kfd->noretry =amdgpu_amdkfd_get_noretry (kfd->kgd);if (kfd_interrupt_init (kfd)) {
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0 -3
@@ -292,9 +292,6 @@ struct kfd_dev {/* xGMI */ uint64_t hive_id; -/* UUID */ -uint64_t unique_id; -bool pci_atomic_requested;/* Use IOMMU v2 flag */
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1 -1
@@ -1340,7 +1340,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) dev->gpu->dqm->sched_policy != KFD_SCHED_POLICY_NO_HWS) ?amdgpu_amdkfd_get_num_gws (dev->gpu->kgd) :0 ; dev->node_props.num_cp_queues =get_cp_queues_num (dev->gpu->dqm); - dev->node_props.unique_id = gpu->unique_id; + dev->node_props.unique_id =amdgpu_amdkfd_get_unique_id (dev->gpu->kgd);kfd_fill_mem_clk_max_info (dev);kfd_fill_iolink_non_crat_info (dev);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 2020-10-28 um 1:11 p.m. schrieb Kent Russell:
Quoted 8 lines
Since the
unique_idis now obtained in amdgpu insmu_late_init, topology misses getting the value during KFD device initialization. To work around this, we useamdgpu_amdkfd_get_unique_idto get theunique_idat read time. Due to this, we can removeunique_idfrom thekfd_devstructure, since we only need it in the KFD node properties structSigned-off-by Kent Russell <[email protected]>
Quoted 38 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 -- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 --- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device.c +0
-2@@ -757,8 +757,6 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, kfd->hive_id =amdgpu_amdkfd_get_hive_id (kfd->kgd); - kfd->unique_id =amdgpu_amdkfd_get_unique_id (kfd->kgd); - kfd->noretry =amdgpu_amdkfd_get_noretry (kfd->kgd);if (kfd_interrupt_init (kfd)) {drivers/gpu/drm/amd/amdkfd/kfd_priv.h +0
-3@@ -292,9 +292,6 @@ struct kfd_dev {/* xGMI */ uint64_t hive_id; -/* UUID */ -uint64_t unique_id; -bool pci_atomic_requested;/* Use IOMMU v2 flag */ drivers/gpu/drm/amd/amdkfd/kfd_topology.c +0
-0
drivers/gpu/drm/amd/amdkfd/kfd_topology.c int kfd_topology_add_device(struct kfd_dev *gpu) · line 1346
Quoted 8 lines
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +1
-1@@ -1340,7 +1340,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) dev->gpu->dqm->sched_policy != KFD_SCHED_POLICY_NO_HWS) ?amdgpu_amdkfd_get_num_gws (dev->gpu->kgd) :0 ; dev->node_props.num_cp_queues =get_cp_queues_num (dev->gpu->dqm); - dev->node_props.unique_id = gpu->unique_id; + dev->node_props.unique_id =amdgpu_amdkfd_get_unique_id (dev->gpu->kgd);kfd_fill_mem_clk_max_info (dev);kfd_fill_iolink_non_crat_info (dev);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx