Commit eb2077fa authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

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



This reverts commit c37ce764.

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: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarJonathan Kim <jonathan.kim@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cd94d1b1

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

+2 −3
Original line number Diff line number Diff line
@@ -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 =