drm/amdkfd: fix the build when CIK support is disabled
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 4 Oct 2019 14:14:35 +0000 (09:14 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 7 Oct 2019 20:11:32 +0000 (15:11 -0500)
Add proper ifdefs around CIK code in kfd setup.

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdkfd/kfd_device.c

index 070c9b5593c92791f028348f513329b3869188a0..8f4b24e84964b7eae692d8e2742b7e1e58730424 100644 (file)
@@ -39,7 +39,9 @@
  */
 static atomic_t kfd_locked = ATOMIC_INIT(0);
 
+#ifdef CONFIG_DRM_AMDGPU_CIK
 extern const struct kfd2kgd_calls gfx_v7_kfd2kgd;
+#endif
 extern const struct kfd2kgd_calls gfx_v8_kfd2kgd;
 extern const struct kfd2kgd_calls gfx_v9_kfd2kgd;
 extern const struct kfd2kgd_calls arcturus_kfd2kgd;
@@ -47,11 +49,15 @@ 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
        [CHIP_TONGA] = &gfx_v8_kfd2kgd,
        [CHIP_FIJI] = &gfx_v8_kfd2kgd,
        [CHIP_POLARIS10] = &gfx_v8_kfd2kgd,