1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
index 52d20f51cad4..80bc71d2c76a 100644
--- 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();