Dave Airlie 9c725e5bcd Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next ... Alex writes: This is the radeon drm-next request. Big changes include: - support for dpm on CIK parts - support for ASPM on CIK parts - support for berlin GPUs - major ring handling cleanup - remove the old 3D blit code for bo moves in favor of CP DMA or sDMA - lots of bug fixes [airlied: fix up a bunch of conflicts from drm_order removal] * 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux: (898 commits) drm/radeon/dpm: make sure dc performance level limits are valid (CI) drm/radeon/dpm: make sure dc performance level limits are valid (BTC-SI) (v2) drm/radeon: gcc fixes for extended dpm tables drm/radeon: gcc fixes for kb/kv dpm drm/radeon: gcc fixes for ci dpm drm/radeon: gcc fixes for si dpm drm/radeon: gcc fixes for ni dpm drm/radeon: gcc fixes for trinity dpm drm/radeon: gcc fixes for sumo dpm drm/radeonn: gcc fixes for rv7xx/eg/btc dpm drm/radeon: gcc fixes for rv6xx dpm drm/radeon: gcc fixes for radeon_atombios.c drm/radeon: enable UVD interrupts on CIK drm/radeon: fix init ordering for r600+ drm/radeon/dpm: only need to reprogram uvd if uvd pg is enabled drm/radeon: check the return value of uvd_v1_0_start in uvd_v1_0_init drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume radeon kms: fix uninitialised hotplug work usage in r100_irq_process() drm/radeon/audio: set up the sads on DCE3.2 asics drm/radeon: fix handling of variable sized arrays for router objects ... Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_gem_dmabuf.c drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/radeon/cik.c drivers/gpu/drm/radeon/ni.c drivers/gpu/drm/radeon/r600.c		2013-09-02 09:31:40 +10:00
..
ast_dram_tables.h	drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2)	2012-05-17 10:53:37 +01:00
ast_drv.c	drm: rip out drm_core_has_MTRR checks	2013-08-19 14:11:44 +10:00
ast_drv.h	drm/gem: create drm_gem_dumb_destroy	2013-08-07 09:59:24 +10:00
ast_fb.c	drm/ast: do not attempt to acquire a reservation while in an interrupt handler	2013-06-28 11:56:39 +10:00
ast_main.c	drm/gem: create drm_gem_dumb_destroy	2013-08-07 09:59:24 +10:00
ast_mode.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
ast_post.c	UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/	2012-10-02 18:01:07 +01:00
ast_tables.h	drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2)	2012-05-17 10:53:37 +01:00
ast_ttm.c	Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next	2013-09-02 09:31:40 +10:00
Kconfig	drivers/gpu/drm/ast: remove depends on CONFIG_EXPERIMENTAL	2013-01-21 14:52:43 -08:00
Makefile	drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2)	2012-05-17 10:53:37 +01:00