drm/amdgpu: Add initial VI support

This adds initial support for VI asics.  This
includes Iceland, Tonga, and Carrizo.  Our inital
focus as been Carrizo, so there are still gaps in
support for Tonga and Iceland, notably power
management.

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 aec2886..9a573e8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -18,29 +18,57 @@ 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
 
+# 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
 
+amdgpu-y += \
+       vi.o
+
+# add GMC block
+amdgpu-y += \
+       gmc_v8_0.o
+
 # add IH block
 amdgpu-y += \
        amdgpu_irq.o \
-       amdgpu_ih.o
+       amdgpu_ih.o \
+       iceland_ih.o \
+       tonga_ih.o \
+       cz_ih.o
 
 # add SMC block
 amdgpu-y += \
-       amdgpu_dpm.o
+       amdgpu_dpm.o \
+       cz_smc.o cz_dpm.o \
+       tonga_smc.o tonga_dpm.o \
+       iceland_smc.o iceland_dpm.o
+
+# add DCE block
+amdgpu-y += \
+       dce_v10_0.o \
+       dce_v11_0.o
 
 # add GFX block
 amdgpu-y += \
-       amdgpu_gfx.o
+       amdgpu_gfx.o \
+       gfx_v8_0.o
+
+# add async DMA block
+amdgpu-y += \
+       sdma_v2_4.o \
+       sdma_v3_0.o
 
 # add UVD block
 amdgpu-y += \
-       amdgpu_uvd.o
+       amdgpu_uvd.o \
+       uvd_v5_0.o \
+       uvd_v6_0.o
 
 # add VCE block
 amdgpu-y += \
-       amdgpu_vce.o
+       amdgpu_vce.o \
+       vce_v3_0.o
 
 amdgpu-$(CONFIG_COMPAT) += amdgpu_ioc32.o
 amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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