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

[Kim, Jonathan]

[Public]

> -----Original Message-----
> From: Lazar, Lijo <Lijo.Lazar at amd.com>
> Sent: Tuesday, April 23, 2024 7:28 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Deucher, Alexander
> <Alexander.Deucher at amd.com>; Joshi, Mukul <Mukul.Joshi at amd.com>;
> Kim, Jonathan <Jonathan.Kim at amd.com>; Poag, Charis
> <Charis.Poag at amd.com>; Cheung, Donald <donald.cheung at amd.com>; Yat
> Sin, David <David.YatSin at amd.com>; Chaudhary, Jatin Jaikishan
> <JatinJaikishan.Chaudhary at amd.com>; Du, Wenkai <Wenkai.Du at amd.com>
> Subject: [PATCH] Revert "drm/amdkfd: Add partition id field to location_id"
>
> This reverts commit 925c7bd1d1cf9f173b22603c8bd4816d142d4935.
>
> 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 at amd.com>

Reviewed-by: Jonathan Kim <jonathan.kim at amd.com>

> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index c51f131eaa2f..bc9eb847ecfe 100644
> --- 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 =
> --
> 2.25.1