From: Lijo Lazar Date: Wed, 7 Aug 2024 16:11:59 +0000 (+0530) Subject: drm/amdkfd: Add node_id to location_id generically X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=42b3a6f12aa56dcf789464d29fdf11f33bf0e793;p=users%2Fjedix%2Flinux-maple.git drm/amdkfd: Add node_id to location_id generically If there are multiple nodes per kfd device, add nodeid to location_id to differentiate. Signed-off-by: Lijo Lazar Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index 27d452e50ca99..3871591c9aec9 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -2078,7 +2078,7 @@ int kfd_topology_add_device(struct kfd_node *gpu) HSA_CAP_ASIC_REVISION_MASK); dev->node_props.location_id = pci_dev_id(gpu->adev->pdev); - if (KFD_GC_VERSION(dev->gpu->kfd) == IP_VERSION(9, 4, 3)) + if (gpu->kfd->num_nodes > 1) dev->node_props.location_id |= dev->gpu->node_id; dev->node_props.domain = pci_domain_nr(gpu->adev->pdev->bus);