OpenCloudOS-Kernel/drivers/gpu/drm/exynos
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 drm/exynos: Select VIDEOMODE_HELPERS for FIMD 2013-04-29 14:35:32 +09:00
Makefile drm/exynos: add gsc ipp driver 2012-12-15 02:40:00 +09:00
exynos_ddc.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_buf.c drm/exynos: remove duplicated error routine and unnecessary assign 2013-07-04 15:55:37 +09:00
exynos_drm_buf.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_connector.c drm/exynos: Remove tracking log functions 2013-06-28 21:13:55 +09:00
exynos_drm_connector.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_core.c drm/exynos: Remove tracking log functions 2013-06-28 21:13:55 +09:00
exynos_drm_crtc.c drm: Pass page flip ioctl flags to driver 2013-08-30 09:24:54 +10:00
exynos_drm_crtc.h drm/exynos: move finish page flip to a common place 2013-01-07 13:58:37 +09:00
exynos_drm_dmabuf.c drm/exynos: explicit store base gem object in dma_buf->priv 2013-08-19 10:45:38 +10:00
exynos_drm_dmabuf.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_drv.c drm: const'ify ioctls table (v2) 2013-08-07 10:10:02 +10:00
exynos_drm_drv.h drm/exynos: hdmi: use drm_display_mode to check the supported modes 2013-06-28 21:12:52 +09:00
exynos_drm_encoder.c drm/exynos: Remove tracking log functions 2013-06-28 21:13:55 +09:00
exynos_drm_encoder.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_fb.c drm/exynos: Remove tracking log functions 2013-06-28 21:13:55 +09:00
exynos_drm_fb.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_fbdev.c drm/exynos: Remove tracking log functions 2013-06-28 21:13:55 +09:00
exynos_drm_fbdev.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_fimc.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_fimc.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_fimd.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_g2d.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_g2d.h drm/exynos: add G2D driver 2012-05-17 20:14:48 +09:00
exynos_drm_gem.c drm/gem: fix up flink name create race 2013-08-21 12:53:45 +10:00
exynos_drm_gem.h drm/gem: create drm_gem_dumb_destroy 2013-08-07 09:59:24 +10:00
exynos_drm_gsc.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_gsc.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_hdmi.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_hdmi.h drm/exynos: hdmi: use drm_display_mode to check the supported modes 2013-06-28 21:12:52 +09:00
exynos_drm_iommu.c drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_iommu.h drm/exynos: fix iommu address allocation order 2013-02-21 15:00:26 +09:00
exynos_drm_ipp.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_ipp.h drm/exynos: change member variable name. 2013-01-04 15:54:33 +09:00
exynos_drm_plane.c drm/exynos: Remove tracking log functions 2013-06-28 21:13:55 +09:00
exynos_drm_plane.h drm/exynos: add plane enable/disable 2012-07-27 11:13:54 +09:00
exynos_drm_rotator.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_rotator.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_drm_vidi.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_drm_vidi.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_hdmi.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_hdmi.h drm/exynos: change file license to GPL 2013-01-04 15:54:32 +09:00
exynos_hdmiphy.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
exynos_mixer.c drm/exynos: Remove module.h header inclusion 2013-07-30 02:01:54 +09:00
regs-fimc.h drm/exynos: add device tree support for fimc ipp driver 2013-04-29 14:35:32 +09:00
regs-gsc.h drm/exynos: add gsc ipp driver 2012-12-15 02:40:00 +09:00
regs-hdmi.h drm/exynos: add support for hdmiphy power control for exynos5 2012-12-14 15:40:49 +09:00
regs-mixer.h drm/exynos: add support for exynos5420 mixer 2013-06-28 21:13:57 +09:00
regs-rotator.h drm/exynos: add rotator ipp driver 2012-12-15 02:39:41 +09:00
regs-vp.h drm/exynos: added hdmi display support 2011-12-29 11:21:42 +09:00