linux/drivers/gpu/drm/nouveau/core/subdev
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
..
bar drm/nvc0/vm: handle bar tlb flushes internally 2013-07-01 13:44:57 +10:00
bios nouveau: add runtime PM support (v0.9) 2013-08-29 13:30:46 +10:00
bus drm/nouveau: quiet static-related sparse noise 2013-02-20 16:00:36 +10:00
clock drm/nva3/clk: minor improvements to fractional N calculation 2013-07-01 13:44:06 +10:00
devinit drm/nvc0/devinit: minor typo 2013-07-05 13:43:55 +10:00
fb drm/nouveau/fb: fix null derefs in nv49 and nv4e init 2013-08-21 11:35:53 +10:00
gpio drm/nv50/gpio: post-nv92 cards have 32 interrupt lines 2013-07-30 13:04:14 +10:00
i2c drm/nouveau/i2c: remove parent deref hack 2013-04-26 15:37:58 +10:00
ibus
instmem drm/nouveau/fb: initialise vram controller as pfb sub-object 2013-07-01 13:44:04 +10:00
ltcg drm/nouveau/ltcg: fix allocating memory as free 2013-08-21 11:35:53 +10:00
mc Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next 2013-09-02 09:31:40 +10:00
mxm drm/nouveau: use pr_cont 2013-02-20 16:00:31 +10:00
therm drm/nouveau/therm: send some messages to debug level 2013-04-26 15:37:55 +10:00
timer drm/nouveau/timer: allow alarms to be cancelled 2013-04-26 15:38:15 +10:00
vm drm/nouveau/vm: make vm refcount into a kref 2013-07-30 16:42:29 +10:00