drm/amdkfd: Set iolink non-coherent in topology

Fix non-coherent bit of iolink properties flag
which always is 0.

Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index ff4e296c1c58b5cd4e8a7e41e7ed173cfc2b739e..b1ce072aa20bb5b6cddbc5505e44ffe5fcbd2167 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1222,6 +1222,28 @@ static void kfd_set_iolink_no_atomics(struct kfd_topology_device *dev,
        }
 }
 
+static void kfd_set_iolink_non_coherent(struct kfd_topology_device *to_dev,
+               struct kfd_iolink_properties *outbound_link,
+               struct kfd_iolink_properties *inbound_link)
+{
+       /* CPU -> GPU with PCIe */
+       if (!to_dev->gpu &&
+           inbound_link->iolink_type == CRAT_IOLINK_TYPE_PCIEXPRESS)
+               inbound_link->flags |= CRAT_IOLINK_FLAGS_NON_COHERENT;
+
+       if (to_dev->gpu) {
+               /* GPU <-> GPU with PCIe and
+                * Vega20 with XGMI
+                */
+               if (inbound_link->iolink_type == CRAT_IOLINK_TYPE_PCIEXPRESS ||
+                   (inbound_link->iolink_type == CRAT_IOLINK_TYPE_XGMI &&
+                   to_dev->gpu->device_info->asic_family == CHIP_VEGA20)) {
+                       outbound_link->flags |= CRAT_IOLINK_FLAGS_NON_COHERENT;
+                       inbound_link->flags |= CRAT_IOLINK_FLAGS_NON_COHERENT;
+               }
+       }
+}
+
 static void kfd_fill_iolink_non_crat_info(struct kfd_topology_device *dev)
 {
        struct kfd_iolink_properties *link, *inbound_link;
@@ -1247,6 +1269,7 @@ static void kfd_fill_iolink_non_crat_info(struct kfd_topology_device *dev)
 
                        inbound_link->flags = CRAT_IOLINK_FLAGS_ENABLED;
                        kfd_set_iolink_no_atomics(peer_dev, dev, inbound_link);
+                       kfd_set_iolink_non_coherent(peer_dev, link, inbound_link);
                }
        }
 }