drm/amdkfd: Fix getting unique_id in topology (d95c368a) · Commits · 戴 / test

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 Signed-off-by:

Kent Russell <kent.russell@amd.com> Reviewed-by:

Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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);

Admin message