From: Shiwu Zhang Date: Mon, 13 Feb 2023 07:45:42 +0000 (+0800) Subject: drm/amdgpu: preserve the num_links in case of reflection X-Git-Tag: v6.5-rc1~153^2~7^2~397 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ae0ec8b8045d72467d4e7417b34a5ab2fa72138;p=thirdparty%2Flinux.git drm/amdgpu: preserve the num_links in case of reflection For topology reflection, each socket to every other socket has the exactly same topology info as the other way around. So it is safe to keep the reflected num_links value otherwise it will be overriden by the link info output of GET_PEER_LINKS command. Signed-off-by: Shiwu Zhang Reviewed-by: Le Ma Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index 4395c53d09d83..ea47012795e7f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -1402,7 +1402,8 @@ int psp_xgmi_get_topology_info(struct psp_context *psp, topology->nodes[i].num_links = get_extended_data ? topology->nodes[i].num_links + link_info_output->nodes[i].num_links : - link_info_output->nodes[i].num_links; + ((requires_reflection && topology->nodes[i].num_links) ? topology->nodes[i].num_links : + link_info_output->nodes[i].num_links); /* reflect the topology information for bi-directionality */ if (requires_reflection && topology->nodes[i].num_hops)