From: Philip Cox Date: Sat, 9 Dec 2017 04:09:01 +0000 (-0500) Subject: drm/amdkfd: Fixup incorrect info in the CZ CRAT table X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=70f372bffcc84c9790acbae07d25d7dd0eca4d9f;p=linux.git 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 Signed-off-by: Kent Russell Signed-off-by: Felix Kuehling Acked-by: Oded Gabbay Signed-off-by: Oded Gabbay --- diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index 52d20f51cad42..80bc71d2c76a5 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();