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
..
accel_2d.c
backlight.c
cdv_device.c
cdv_device.h
cdv_intel_crt.c
cdv_intel_display.c
cdv_intel_dp.c
cdv_intel_hdmi.c
cdv_intel_lvds.c
framebuffer.c
framebuffer.h
gem.c
gma_display.c
gma_display.h
gtt.c
gtt.h
intel_bios.c
intel_bios.h
intel_gmbus.c
intel_i2c.c
Kconfig
Makefile
mdfld_device.c
mdfld_dsi_dpi.c
mdfld_dsi_dpi.h
mdfld_dsi_output.c
mdfld_dsi_output.h
mdfld_dsi_pkg_sender.c
mdfld_dsi_pkg_sender.h
mdfld_intel_display.c
mdfld_output.c
mdfld_output.h
mdfld_tmd_vid.c
mdfld_tpo_vid.c
mid_bios.c
mid_bios.h
mmu.c
oaktrail_crtc.c
oaktrail_device.c
oaktrail_hdmi_i2c.c
oaktrail_hdmi.c
oaktrail_lvds.c
oaktrail.h
opregion.c
opregion.h
power.c
power.h
psb_device.c
psb_device.h
psb_drv.c
psb_drv.h
psb_intel_display.c
psb_intel_drv.h
psb_intel_lvds.c
psb_intel_modes.c
psb_intel_reg.h
psb_intel_sdvo_regs.h
psb_intel_sdvo.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
psb_irq.c
psb_irq.h
psb_lid.c
psb_reg.h
tc35876x-dsi-lvds.c
tc35876x-dsi-lvds.h