Merge branch 'drm-next-4.2-amdgpu' of git://people.freedesktop.org/~agd5f/linux into drm-next

source "drivers/gpu/drm/radeon/Kconfig"

config DRM_AMDGPU

	tristate "AMD GPU"

	depends on DRM && PCI

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select FW_LOADER

        select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

        select DRM_TTM

	select POWER_SUPPLY

	select HWMON

	select BACKLIGHT_CLASS_DEVICE

	select INTERVAL_TREE

	help

	  Choose this option if you have a recent AMD Radeon graphics card.

	  If M is selected, the module will be called amdgpu.

source "drivers/gpu/drm/amd/amdgpu/Kconfig"

source "drivers/gpu/drm/nouveau/Kconfig"

config DRM_I810

obj-$(CONFIG_DRM_R128)	+= r128/

obj-$(CONFIG_HSA_AMD) += amd/amdkfd/

obj-$(CONFIG_DRM_RADEON)+= radeon/

obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/

obj-$(CONFIG_DRM_MGA)	+= mga/

obj-$(CONFIG_DRM_I810)	+= i810/

obj-$(CONFIG_DRM_I915)  += i915/

config DRM_AMDGPU_CIK

	bool "Enable amdgpu support for CIK parts"

	depends on DRM_AMDGPU

	help

	  Choose this option if you want to enable experimental support

	  for CIK asics.

	  CIK is already supported in radeon.  CIK support in amdgpu

	  is for experimentation and testing.

config DRM_AMDGPU_USERPTR

	bool "Always enable userptr write support"

	depends on DRM_AMDGPU

	select MMU_NOTIFIER

	help

	  This option selects CONFIG_MMU_NOTIFIER if it isn't already

	  selected to enabled full userptr support.

#

# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/amd/include/asic_reg \

	-Idrivers/gpu/drm/amd/include

amdgpu-y := amdgpu_drv.o

# add KMS driver

amdgpu-y += amdgpu_device.o amdgpu_kms.o \

	amdgpu_atombios.o atombios_crtc.o amdgpu_connectors.o \

	atom.o amdgpu_fence.o amdgpu_ttm.o amdgpu_object.o amdgpu_gart.o \

	amdgpu_encoders.o amdgpu_display.o amdgpu_i2c.o \

	amdgpu_fb.o amdgpu_gem.o amdgpu_ring.o \

	amdgpu_cs.o amdgpu_bios.o amdgpu_benchmark.o amdgpu_test.o \

	amdgpu_pm.o atombios_dp.o amdgpu_afmt.o amdgpu_trace_points.o \

	atombios_encoders.o amdgpu_semaphore.o amdgpu_sa.o atombios_i2c.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 \

	iceland_ih.o \

	tonga_ih.o \

	cz_ih.o

# add SMC block

amdgpu-y += \

	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 \

	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 \

	uvd_v5_0.o \

	uvd_v6_0.o

# add VCE block

amdgpu-y += \

	amdgpu_vce.o \

	vce_v3_0.o

amdgpu-$(CONFIG_COMPAT) += amdgpu_ioc32.o

amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o

amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o

amdgpu-$(CONFIG_MMU_NOTIFIER) += amdgpu_mn.o

obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o

CFLAGS_amdgpu_trace_points.o := -I$(src)