drm/amdkfd: fix p2p links bug in topology

When creating p2p links, KFD needs to check XGMI link
with two conditions, hive_id and is_sharing_enabled,
but it is missing to check is_sharing_enabled, so add
it to fix the error.

Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 36cc7d13178d901982da7a122c883861d98da624)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 4ec73f33535ebfc20c9b5dc8c89c52aa4c44b126..720b20e842ba43f277d548f8a4c92b3ecd8fbc86 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1587,7 +1587,8 @@ static int kfd_dev_create_p2p_links(void)
                        break;
                if (!dev->gpu || !dev->gpu->adev ||
                    (dev->gpu->kfd->hive_id &&
-                    dev->gpu->kfd->hive_id == new_dev->gpu->kfd->hive_id))
+                    dev->gpu->kfd->hive_id == new_dev->gpu->kfd->hive_id &&
+                    amdgpu_xgmi_get_is_sharing_enabled(dev->gpu->adev, new_dev->gpu->adev)))
                        goto next;
 
                /* check if node(s) is/are peer accessible in one direction or bi-direction */