linux/drivers/gpu/drm/gma500
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 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
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 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
mdfld_dsi_pkg_sender.h
mdfld_intel_display.c drm/gma500: Rename psb_intel_encoder to gma_encoder 2013-07-24 01:49:43 +02:00
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 drm/gma500: Rename psb_intel_encoder to gma_encoder 2013-07-24 01:49:43 +02:00
oaktrail_device.c
oaktrail_hdmi_i2c.c
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
opregion.c
opregion.h
power.c
power.h
psb_device.c
psb_device.h
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
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