[PATCH 1/2] drm/amdgpu: add and populate the port num into xgmi topology info

[Shiwu Zhang]

The port num info is firstly introduced with 20.00.01.13 xgmi ta and
make them as part of topology info.

Signed-off-by: Shiwu Zhang <shiwu.zh...@amd.com>
Reviewed-by: Le Ma <le...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 +++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index e6dc3cfbac0e..dd82aaec1922 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1473,6 +1473,11 @@ int psp_xgmi_get_topology_info(struct psp_context *psp,
                                topology->nodes[i].num_links = 
(requires_reflection && topology->nodes[i].num_links) ?
                                                                
topology->nodes[i].num_links : node_num_links;
                        }
+                       /* popluate the connected port num info if supported 
and available */
+                       if (ta_port_num_support && 
topology->nodes[i].num_links) {
+                               memcpy(topology->nodes[i].port_num, 
link_extend_info_output->nodes[i].port_num,
+                                      sizeof(struct xgmi_connected_port_num) * 
TA_XGMI__MAX_PORT_NUM);
+                       }
 
                        /* reflect the topology information for 
bi-directionality */
                        if (requires_reflection && topology->nodes[i].num_hops)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 7111dd32e66f..d185a58de935 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -149,6 +149,7 @@ struct psp_xgmi_node_info {
        uint8_t                                 is_sharing_enabled;
        enum ta_xgmi_assigned_sdma_engine       sdma_engine;
        uint8_t                                 num_links;
+       struct xgmi_connected_port_num          port_num[TA_XGMI__MAX_PORT_NUM];
 };
 
 struct psp_xgmi_topology_info {
-- 
2.17.1