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

drm: Replace pitch with pitches[] in drm_framebuffer

2011-12-20 10:06:27 +00:00

backlight.c

gma500/cdv: Add eDP support

2012-08-24 09:29:25 +10:00

cdv_device.c

drm/gma500/cdv: Add and hook up chip op for disabling sr

2013-08-15 00:54:44 +02:00

cdv_device.h

drm/gma500/cdv: Add and hook up chip op for disabling sr

2013-08-15 00:54:44 +02:00

cdv_intel_crt.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

cdv_intel_display.c

drm/gma500/cdv: Add and hook up chip op for disabling sr

2013-08-15 00:54:44 +02:00

cdv_intel_dp.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

cdv_intel_hdmi.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

cdv_intel_lvds.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

framebuffer.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

framebuffer.h

drm/gma500: Rename psb_intel_connector to gma_connector

2013-07-24 01:47:34 +02:00

gem.c

drm/gem: create drm_gem_dumb_destroy

2013-08-07 09:59:24 +10:00

gma_display.c

drm/gma500/cdv: Add and hook up chip op for disabling sr

2013-08-15 00:54:44 +02:00

gma_display.h

drm/gma500/cdv: Add and hook up chip op for disabling sr

2013-08-15 00:54:44 +02:00

gtt.c

drm/gma500: use gem get/put page helpers

2013-08-19 10:36:08 +10:00

gtt.h

drm/gma500: Add support for rebuilding the gtt

2013-04-07 17:09:05 +02:00

intel_bios.c

drivers: gpu: drm: gma500: Replaced calls kzalloc & memcpy with kmemdup

2013-03-13 22:37:32 +01:00

intel_bios.h

drm/gma500: Clean up various defines

2013-03-17 18:32:56 +01:00

intel_gmbus.c

UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/

2012-10-02 18:01:07 +01:00

intel_i2c.c

gma500: fixup build versus latest header changes.

2011-11-16 12:14:04 +00:00

Kconfig

Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

2013-04-17 15:18:32 +10:00

Makefile

drm/gma500: Add generic code for clock calculation

2013-07-24 01:47:16 +02:00

mdfld_device.c

gma500: handle poulsbo cursor restriction

2012-05-22 10:15:34 +01:00

mdfld_dsi_dpi.c

drm: Make the .mode_fixup() operations mode argument a const pointer

2012-07-19 21:52:38 -04:00

mdfld_dsi_dpi.h

drm: Make the .mode_fixup() operations mode argument a const pointer

2012-07-19 21:52:38 -04:00

mdfld_dsi_output.c

drm/gma500: Rename psb_intel_crtc to gma_crtc

2013-07-24 01:47:33 +02:00

mdfld_dsi_output.h

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

mdfld_dsi_pkg_sender.c

gma500: use the register map to clean up

2012-05-11 17:35:51 +01:00

mdfld_dsi_pkg_sender.h

gma500: initial medfield merge

2012-03-10 13:05:48 +00:00

mdfld_intel_display.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

mdfld_output.c

gma500: mdfld_dsi_output_init() drop unused parameter

2012-03-10 13:05:51 +00:00

mdfld_output.h

gma500: initial medfield merge

2012-03-10 13:05:48 +00:00

mdfld_tmd_vid.c

gma500: initial medfield merge

2012-03-10 13:05:48 +00:00

mdfld_tpo_vid.c

gma500: initial medfield merge

2012-03-10 13:05:48 +00:00

mid_bios.c

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2012-10-03 23:29:23 -07:00

mid_bios.h

gma500: Add the glue to the various BIOS and firmware interfaces

2011-11-16 11:25:28 +00:00

mmu.c

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2012-03-22 13:08:22 -07:00

oaktrail_crtc.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

oaktrail_device.c

gma600: Enable HDMI support

2012-11-07 10:59:32 +10:00

oaktrail_hdmi_i2c.c

i2c: Ignore return value of i2c_del_adapter()

2013-04-02 07:06:03 +02:00

oaktrail_hdmi.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

oaktrail_lvds.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

oaktrail.h

gma600: Enable HDMI support

2012-11-07 10:59:32 +10:00

opregion.c

gma500/cdv: Add eDP support

2012-08-24 09:29:25 +10:00

opregion.h

gma500: move the ASLE enable

2012-07-16 09:20:33 -07:00

power.c

drm/gma500: Add hooks for hibernation

2013-04-07 17:09:34 +02:00

power.h

drm/gma500: Add hooks for hibernation

2013-04-07 17:09:34 +02:00

psb_device.c

drm/gma500/psb: Make use of generic clock code

2013-07-24 01:47:18 +02:00

psb_device.h

drm/gma500/psb: Make use of generic clock code

2013-07-24 01:47:18 +02:00

psb_drv.c

Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

2013-08-22 10:38:28 +10:00

psb_drv.h

Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

2013-08-22 10:38:28 +10:00

psb_intel_display.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

psb_intel_drv.h

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

psb_intel_lvds.c

drm/gma500: Rename psb_intel_encoder to gma_encoder

2013-07-24 01:49:43 +02:00

psb_intel_modes.c

gma500: Remove psb_intel_output from ddc_probe and ddc_get_modes

2011-12-20 10:23:06 +00:00

psb_intel_reg.h

drm/gma500: Clean up various defines

2013-03-17 18:32:56 +01:00

psb_intel_sdvo_regs.h

gma500: Replace SDVO code with slightly modified version from i915

2011-12-20 10:23:14 +00:00

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

drm/gma500: fix backlight hotkeys behaviour on netbooks

2013-04-25 22:11:14 +02:00

psb_irq.h

drm/gma500: Clean up various defines

2013-03-17 18:32:56 +01:00

psb_lid.c

gma500: Prevent endless loop in panel power up sequence

2012-05-22 10:15:29 +01:00

psb_reg.h

gma500: Add the core DRM files and headers

2011-11-16 11:26:35 +00:00

tc35876x-dsi-lvds.c

Drivers: gpu: remove __dev* attributes.

2013-01-03 15:57:15 -08:00

tc35876x-dsi-lvds.h

gma500: initial medfield merge

2012-03-10 13:05:48 +00:00