drm/amdkfd: Fixup incorrect info in the CZ CRAT table

* Wrong value for max_waves_per_simd
* Missing ATC capability bit

Signed-off-by: Philip Cox <Philip.Cox@amd.com>
Signed-off-by: Kent Russell <kent.russell@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Acked-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 52d20f51cad421d01f07fddb02cb8f3b08e0db1e..80bc71d2c76a53a18d79ed044f6c5a6c0b351be9 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -1229,12 +1229,15 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
        /* Fix errors in CZ CRAT.
         * simd_count: Carrizo CRAT reports wrong simd_count, probably
         *              because it doesn't consider masked out CUs
-        * capability flag: Carrizo CRAT doesn't report IOMMU
-        *              flags. TODO: Fix this.
+        * max_waves_per_simd: Carrizo reports wrong max_waves_per_simd
+        * capability flag: Carrizo CRAT doesn't report IOMMU flags
         */
-       if (dev->gpu->device_info->asic_family == CHIP_CARRIZO)
+       if (dev->gpu->device_info->asic_family == CHIP_CARRIZO) {
                dev->node_props.simd_count =
                        cu_info.simd_per_cu * cu_info.cu_active_number;
+               dev->node_props.max_waves_per_simd = 10;
+               dev->node_props.capability |= HSA_CAP_ATS_PRESENT;
+       }
 
        kfd_debug_print_topology();