drm/amdkfd: Fix a building error when KFD_SUPPORT_IOMMU_V2 is turned off
Subsystems (3)
PATCH 1/1 drm/amdkfd: Fix a building error when KFD_SUPPORT_IOMMU_V2 is turned off
The issue was accidentally introduced recently.
Change-Id I3b21caa1596d4f7de1866bed1cb5d8fe1b51504c
Signed-off-by Yong Zhao <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device.c +4 -2
@@ -371,11 +371,14 @@ static const struct kfd_device_info navi10_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}, - [CHIP_CARRIZO ] = {&carrizo_device_info,NULL }, [CHIP_POLARIS10 ] = {&polaris10_device_info, &polaris10_vf_device_info}, [CHIP_POLARIS11 ] = {&polaris11_device_info,NULL }, [CHIP_POLARIS12 ] = {&polaris12_device_info,NULL },
@@ -383,7 +386,6 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { [CHIP_VEGA10] = {&vega10_device_info, &vega10_vf_device_info}, [CHIP_VEGA12] = {&vega12_device_info, NULL}, [CHIP_VEGA20] = {&vega20_device_info, NULL}, - [CHIP_RAVEN] = {&raven_device_info, NULL}, [CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info}, [CHIP_NAVI10] = {&navi10_device_info, NULL}, };
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Kuehling, Felix
Reviewed-by Felix KuehlingQuoted 4 lines · Yong
The issue was accidentally introduced recently.
Change-Id I3b21caa1596d4f7de1866bed1cb5d8fe1b51504cSigned-off-by Yong Zhao <[email protected]>
Reviewed-by Felix Kuehling <[email protected]>
Quoted 25 lines
--- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_device.c +4
-1@@ -371,11 +371,14 @@ static const struct kfd_device_info navi10_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}, - [CHIP_CARRIZO ] = {&carrizo_device_info,NULL }, [CHIP_POLARIS10 ] = {&polaris10_device_info, &polaris10_vf_device_info}, [CHIP_POLARIS11 ] = {&polaris11_device_info,NULL }, [CHIP_POLARIS12 ] = {&polaris12_device_info,NULL },
drivers/gpu/drm/amd/amdkfd/kfd_device.c static const struct kfd_device_info *kfd_supported_devices[][2] = { · line 391
Quoted 7 lines
drivers/gpu/drm/amd/amdkfd/kfd_device.c +0
-1@@ -383,7 +386,6 @@ static const struct kfd_device_info *kfd_supported_devices[][2] = { [CHIP_VEGA10] = {&vega10_device_info, &vega10_vf_device_info}, [CHIP_VEGA12] = {&vega12_device_info, NULL}, [CHIP_VEGA20] = {&vega20_device_info, NULL}, - [CHIP_RAVEN] = {&raven_device_info, NULL}, [CHIP_ARCTURUS] = {&arcturus_device_info, &arcturus_device_info}, [CHIP_NAVI10] = {&navi10_device_info, NULL}, };
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx