On Tue, Aug 18, 2020 at 11:15:47PM +0800, Kuehling, Felix wrote: > Interesting. Does this actually work on Carrizo or Kaveri? I'd like to I just found a Carrizo board, rocm info works well, and clinfo is able to print most information. But it seems stuck in the ROCr (submit SubmitLinearCopyCommand). Let me take a look. Thanks, Ray > see any Thunk changes needed to support this before giving my R-b. For > now this patch is > > Acked-by: Felix Kuehling <Felix.Kuehling@xxxxxxx> > > > Am 2020-08-18 um 9:09 a.m. schrieb Huang Rui: > > We already support the fallback path, so it doesn't need IOMMU v2 flag > > anymore. > > > > Signed-off-by: Huang Rui <ray.huang@xxxxxxx> > > --- > > drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 ------ > > 1 file changed, 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > > index dab44951c4d8..731f7fdfe9d2 100644 > > --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c > > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c > > @@ -48,13 +48,11 @@ extern const struct kfd2kgd_calls arcturus_kfd2kgd; > > extern const struct kfd2kgd_calls gfx_v10_kfd2kgd; > > > > static const struct kfd2kgd_calls *kfd2kgd_funcs[] = { > > -#ifdef KFD_SUPPORT_IOMMU_V2 > > #ifdef CONFIG_DRM_AMDGPU_CIK > > [CHIP_KAVERI] = &gfx_v7_kfd2kgd, > > #endif > > [CHIP_CARRIZO] = &gfx_v8_kfd2kgd, > > [CHIP_RAVEN] = &gfx_v9_kfd2kgd, > > -#endif > > #ifdef CONFIG_DRM_AMDGPU_CIK > > [CHIP_HAWAII] = &gfx_v7_kfd2kgd, > > #endif > > @@ -74,7 +72,6 @@ static const struct kfd2kgd_calls *kfd2kgd_funcs[] = { > > [CHIP_NAVI14] = &gfx_v10_kfd2kgd, > > }; > > > > -#ifdef KFD_SUPPORT_IOMMU_V2 > > static const struct kfd_device_info kaveri_device_info = { > > .asic_family = CHIP_KAVERI, > > .asic_name = "kaveri", > > @@ -112,7 +109,6 @@ static const struct kfd_device_info carrizo_device_info = { > > .num_xgmi_sdma_engines = 0, > > .num_sdma_queues_per_engine = 2, > > }; > > -#endif > > > > static const struct kfd_device_info raven_device_info = { > > .asic_family = CHIP_RAVEN, > > @@ -460,11 +456,9 @@ static const struct kfd_device_info navi14_device_info = { > > > > /* For each entry, [0] is regular and [1] is virtualisation device. */ > > static const struct kfd_device_info *kfd_supported_devices[][2] = { > > -#ifdef KFD_SUPPORT_IOMMU_V2 > > [CHIP_KAVERI] = {&kaveri_device_info, NULL}, > > [CHIP_CARRIZO] = {&carrizo_device_info, NULL}, > > [CHIP_RAVEN] = {&raven_device_info, NULL}, > > -#endif > > [CHIP_HAWAII] = {&hawaii_device_info, NULL}, > > [CHIP_TONGA] = {&tonga_device_info, NULL}, > > [CHIP_FIJI] = {&fiji_device_info, &fiji_vf_device_info}, _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx