drm/amdkfd: Remove hard‑coded GC IP version checks from kfd_node_by_irq_ids

Replace the GC IP version hard-coded check with multi-aid check in
kfd_node_by_irq_ids(). If aid_mask is not set, we immediately return
dev->nodes[0] otherwise we iterate and match using kfd_irq_is_from_node().

Signed-off-by: Sreekant Somasekharan <Sreekant.Somasekharan@amd.com>
Reviewed-by: Philip Yang <Philip.Yang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 6c05d7f57196e2a2e59e2eedfab70994e43197b8..76842bb8e78ba2eb6271dd79228087225f9d0daa 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -1162,9 +1162,11 @@ static inline struct kfd_node *kfd_node_by_irq_ids(struct amdgpu_device *adev,
        struct kfd_dev *dev = adev->kfd.dev;
        uint32_t i;
 
-       if (KFD_GC_VERSION(dev) != IP_VERSION(9, 4, 3) &&
-           KFD_GC_VERSION(dev) != IP_VERSION(9, 4, 4) &&
-           KFD_GC_VERSION(dev) != IP_VERSION(9, 5, 0))
+       /*
+        * On multi-aid system, attempt per-node matching. Otherwise,
+        * fall back to the first node.
+        */
+       if (!amdgpu_is_multi_aid(adev))
                return dev->nodes[0];
 
        for (i = 0; i < dev->num_nodes; i++)