drm/amdgpu: handle conditional support for CIK properly

gfx7 support is not necessary or available if CIK support
is not enabled.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index 733f77520eee3005cc67339fcbde518476954b9f..4e1c07d0f01cbf4392618ac91f057b62aa111715 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -22,7 +22,8 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
 
 # add asic specific block
 amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o gmc_v7_0.o cik_ih.o kv_smc.o kv_dpm.o \
-       ci_smc.o ci_dpm.o dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o
+       ci_smc.o ci_dpm.o dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o \
+       amdgpu_amdkfd_gfx_v7.o
 
 amdgpu-y += \
        vi.o
@@ -75,7 +76,6 @@ amdgpu-y += \
 # add amdkfd interfaces
 amdgpu-y += \
         amdgpu_amdkfd.o \
-        amdgpu_amdkfd_gfx_v7.o \
         amdgpu_amdkfd_gfx_v8.o
 
 # add cgs

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 4c7c09cead4583c0ac9c65a596cea7a5367987bc..496ed2192ebad6ef2114f66b1b9c20591fab85b0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -50,9 +50,11 @@ bool amdgpu_amdkfd_load_interface(struct amdgpu_device *rdev)
 #endif
 
        switch (rdev->asic_type) {
+#ifdef CONFIG_DRM_AMDGPU_CIK
        case CHIP_KAVERI:
                kfd2kgd = amdgpu_amdkfd_gfx_7_get_functions();
                break;
+#endif
        case CHIP_CARRIZO:
                kfd2kgd = amdgpu_amdkfd_gfx_8_0_get_functions();
                break;