leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdkfd: Initialize HSA_CAP_ATS_PRESENT capability in topology codes

Browse Source 
Move HSA_CAP_ATS_PRESENT initialization logic from kfd iommu codes to
kfd topology codes. This removes kfd_iommu_device_init's dependency
on kfd_topology_add_device. Also remove duplicate code setting the
same.

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Oak Zeng 2019-06-10 15:22:35 -05:00 committed by Alex Deucher
parent f77dac6cd6
commit 1ae99eab34
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/amd/amdkfd/kfd_iommu.c
View File

@ -66,16 +66,8 @@ int kfd_iommu_device_init(struct kfd_dev *kfd)
top_dev = kfd_topology_device_by_id(kfd->id); top_dev = kfd_topology_device_by_id(kfd->id);
/* if (!kfd->device_info->needs_iommu_device)
* Overwrite ATS capability according to needs_iommu_device to fix
* potential missing corresponding bit in CRAT of BIOS.
*/
if (!kfd->device_info->needs_iommu_device) {
top_dev->node_props.capability &= ~HSA_CAP_ATS_PRESENT;
return 0; return 0;
}
top_dev->node_props.capability |= HSA_CAP_ATS_PRESENT;
iommu_info.flags = 0; iommu_info.flags = 0;
err = amd_iommu_device_info(kfd->pdev, &iommu_info); err = amd_iommu_device_info(kfd->pdev, &iommu_info);

11
drivers/gpu/drm/amd/amdkfd/kfd_topology.c
View File

@ -1330,17 +1330,24 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
dev->gpu->device_info->asic_family); dev->gpu->device_info->asic_family);
} }
/*
* Overwrite ATS capability according to needs_iommu_device to fix
* potential missing corresponding bit in CRAT of BIOS.
*/
if (dev->gpu->device_info->needs_iommu_device)
dev->node_props.capability |= HSA_CAP_ATS_PRESENT;
else
dev->node_props.capability &= ~HSA_CAP_ATS_PRESENT;
/* Fix errors in CZ CRAT. /* Fix errors in CZ CRAT.
* simd_count: Carrizo CRAT reports wrong simd_count, probably * simd_count: Carrizo CRAT reports wrong simd_count, probably
* because it doesn't consider masked out CUs * because it doesn't consider masked out CUs
* max_waves_per_simd: Carrizo reports wrong max_waves_per_simd * 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 = dev->node_props.simd_count =
cu_info.simd_per_cu * cu_info.cu_active_number; cu_info.simd_per_cu * cu_info.cu_active_number;
dev->node_props.max_waves_per_simd = 10; dev->node_props.max_waves_per_simd = 10;
dev->node_props.capability |= HSA_CAP_ATS_PRESENT;
} }
ctx = amdgpu_ras_get_context((struct amdgpu_device *)(dev->gpu->kgd)); ctx = amdgpu_ras_get_context((struct amdgpu_device *)(dev->gpu->kgd));