drm/amdgpu: Add support for CIK parts

This patch adds support for CIK parts.  These parts
are also supported by radeon which is the preferred
option, so there is a config option to enable support
for CIK parts in amdgpu for testing.

Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Jammy Zhou <Jammy.Zhou@amd.com>
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 01276a592bc58d2afb778d51f59f4882ebd6a761..aec28866945fe943f9776dd5d9a1d21bb2408033 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -18,6 +18,9 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
        amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \
        amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o
 
+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
+
 # add IH block
 amdgpu-y += \
        amdgpu_irq.o \

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/ci_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/ci_dpm.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/ci_smc.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/cik.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/cik.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/cik_dpm.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/cik_ih.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/cik_ih.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/cik_sdma.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/cik_sdma.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/clearstate_ci.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v8_0.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/kv_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/kv_dpm.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/kv_smc.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/smu7.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/smu7_discrete.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/smu7_fusion.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/vce_v2_0.h
Simple merge