Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Lijo Lazar and committed by
Alex Deucher
421226e5 7e39d7ec

+2 -3
+2 -3
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
··· 2003 2003 HSA_CAP_ASIC_REVISION_MASK); 2004 2004 2005 2005 dev->node_props.location_id = pci_dev_id(gpu->adev->pdev); 2006 - /* On multi-partition nodes, node id = location_id[31:28] */ 2007 - if (gpu->kfd->num_nodes > 1) 2008 - dev->node_props.location_id |= (dev->gpu->node_id << 28); 2006 + if (KFD_GC_VERSION(dev->gpu->kfd) == IP_VERSION(9, 4, 3)) 2007 + dev->node_props.location_id |= dev->gpu->node_id; 2009 2008 2010 2009 dev->node_props.domain = pci_domain_nr(gpu->adev->pdev->bus); 2011 2010 dev->node_props.max_engine_clk_fcompute =