linux/drivers/gpu/drm/nouveau/core/engine
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
..
bsp drm/nouveau: add falcon interrupt handler 2013-07-10 10:48:07 +10:00
copy drm/nouveau/core: move falcon class to engine/ 2013-07-01 13:50:47 +10:00
crypt drm/nouveau/core: move falcon class to engine/ 2013-07-01 13:50:47 +10:00
device drm/nvd7/devinit: use fermi class, not tesla 2013-07-05 13:44:43 +10:00
disp Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next 2013-09-02 09:31:40 +10:00
dmaobj drm/nvf0/disp: expose display class 2.2 2013-05-02 16:23:13 +10:00
fifo drm/nvf0/fifo: enable support 2013-07-05 13:43:25 +10:00
graph drm/nvc0/gr: fix gpc firmware regression 2013-07-08 10:52:07 +10:00
mpeg drm/nv31/mpeg: don't recognize nv3x cards as having nv44 graph class 2013-07-30 13:05:06 +10:00
ppp drm/nouveau: add falcon interrupt handler 2013-07-10 10:48:07 +10:00
software drm/nvc0/gr: add software methods to control some MP regs 2013-04-26 15:37:42 +10:00
vp drm/nouveau: add falcon interrupt handler 2013-07-10 10:48:07 +10:00
falcon.c drm/nouveau: add falcon interrupt handler 2013-07-10 10:48:07 +10:00
xtensa.c drm/nouveau/core: xtensa firmware size needs to be 0x40000 no matter what 2013-07-30 13:03:59 +10:00