Revert "drm/amdkfd: Add partition id field to location_id"

This reverts commit c37ce764cd492f044dcdbb39616298f02b0dbc7f.

RCCL library is currently not treating spatial partitions differently,
hence this change is causing issues. Revert temporarily till RCCL
implementation is ready for spatial partitions.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Jonathan Kim <jonathan.kim@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index c51f131eaa2fbc4c5b69e022b3f2648ca8c24e34..bc9eb847ecfe76648f783ff5b7ee67f6dfadd12d 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1997,9 +1997,8 @@ 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);
-       /* On multi-partition nodes, node id = location_id[31:28] */
-       if (gpu->kfd->num_nodes > 1)
-               dev->node_props.location_id |= (dev->gpu->node_id << 28);
+       if (KFD_GC_VERSION(dev->gpu->kfd) == IP_VERSION(9, 4, 3))
+               dev->node_props.location_id |= dev->gpu->node_id;
 
        dev->node_props.domain = pci_domain_nr(gpu->adev->pdev->bus);
        dev->node_props.max_engine_clk_fcompute =