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
..
drm_fourcc.h
drm_mode.h	drm: Add DRM_MODE_PAGE_FLIP_ASYNC flag definition	2013-08-30 09:25:13 +10:00
drm_sarea.h
drm.h	drm: Advertise async page flip ability through GETCAP ioctl	2013-08-30 09:25:13 +10:00
exynos_drm.h	drm/exynos: consider both case of vflip and hflip.	2013-01-04 15:54:33 +09:00
i810_drm.h
i915_drm.h	drm/i915: Use Write-Through cacheing for the display plane on Iris	2013-08-22 13:31:38 +02:00
Kbuild	drm/msm: add a3xx gpu support	2013-08-24 14:57:18 -04:00
mga_drm.h
msm_drm.h	drm/msm: add a3xx gpu support	2013-08-24 14:57:18 -04:00
nouveau_drm.h
omap_drm.h	drm/omap: move out of staging	2013-02-16 17:38:06 -05:00
qxl_drm.h	drm: add new QXL driver. (v1.4)	2013-04-12 13:51:07 +10:00
r128_drm.h
radeon_drm.h	drm/radeon/si: Add support for CP DMA to CS checker for compute v2	2013-08-30 16:30:59 -04:00
savage_drm.h
sis_drm.h
tegra_drm.h	drm/tegra: Include header drm/drm.h	2013-06-22 12:43:50 +02:00
via_drm.h
vmwgfx_drm.h