linux/drivers/gpu/drm/vmwgfx
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
..
Kconfig
Makefile
svga3d_reg.h
svga3d_surfacedefs.h
svga_escape.h
svga_overlay.h
svga_reg.h
svga_types.h
vmwgfx_buffer.c
vmwgfx_context.c
vmwgfx_dmabuf.c drm/vmwgfx: get rid of ttm_bo_is_reserved usage 2013-06-28 12:04:14 +10:00
vmwgfx_drv.c drm/vmwgfx: fix error return code in vmw_driver_load() 2013-08-30 08:57:51 +10:00
vmwgfx_drv.h drm/vmwgfx: remove ->firstopen callback 2013-08-19 14:28:07 +10:00
vmwgfx_execbuf.c drm/ttm: make ttm reservation calls behave like reservation calls 2013-06-28 12:02:20 +10:00
vmwgfx_fb.c
vmwgfx_fence.c
vmwgfx_fence.h
vmwgfx_fifo.c
vmwgfx_gmr.c drm/vmwgfx: Split GMR2_REMAP commands if they are to large 2013-08-30 09:03:39 +10:00
vmwgfx_gmrid_manager.c
vmwgfx_ioctl.c
vmwgfx_irq.c
vmwgfx_kms.c drm: Pass page flip ioctl flags to driver 2013-08-30 09:24:54 +10:00
vmwgfx_kms.h drm: Pass page flip ioctl flags to driver 2013-08-30 09:24:54 +10:00
vmwgfx_ldu.c
vmwgfx_marker.c
vmwgfx_overlay.c
vmwgfx_reg.h
vmwgfx_resource_priv.h
vmwgfx_resource.c drm/ttm: convert to unified vma offset manager 2013-07-25 20:47:07 +10:00
vmwgfx_scrn.c
vmwgfx_surface.c
vmwgfx_ttm_glue.c