OpenCloudOS-Kernel/drivers/gpu/drm/exynos
Dave Airlie 1a1494def7 Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next
Alex writes:
Pretty minor -next pull request.  We some additional new bits waiting
internally for release.  Hopefully Monday we can get at least some of
them out.  The others will probably take a few more weeks.

Highlights of the current request:
- ELD registers for passing audio information to the sound hardware
- Handle GPUVM page faults more gracefully
- Misc fixes

Merge radeon test
* 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux: (483 commits)
  drm/radeon: bump driver version for new info ioctl requests
  drm/radeon: fix eDP clk and lane setup for scaled modes
  drm/radeon: add new INFO ioctl requests
  drm/radeon/dce32+: use fractional fb dividers for high clocks
  drm/radeon: use cached memory when evicting for vram on non agp
  drm/radeon: add a CS flag END_OF_FRAME
  drm/radeon: stop page faults from hanging the system (v2)
  drm/radeon/dce4/5: add registers for ELD handling
  drm/radeon/dce3.2: add registers for ELD handling
  radeon: fix pll/ctrc mapping on dce2 and dce3 hardware
  Linux 3.7-rc7
  powerpc/eeh: Do not invalidate PE properly
  Revert "drm/i915: enable rc6 on ilk again"
  ALSA: hda - Fix build without CONFIG_PM
  of/address: sparc: Declare of_iomap as an extern function for sparc again
  PM / QoS: fix wrong error-checking condition
  bnx2x: remove redundant warning log
  vxlan: fix command usage in its doc
  8139cp: revert "set ring address before enabling receiver"
  MPI: Fix compilation on MIPS with GCC 4.4 and newer
  ...

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_encoder.c
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
2012-12-10 20:03:58 +10:00
..
Kconfig drm/exynos: add iommu support for exynos drm framework 2012-11-29 03:30:35 -08:00
Makefile drm/exynos: add iommu support for exynos drm framework 2012-11-29 03:30:35 -08:00
exynos_ddc.c Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next 2012-10-07 21:06:33 +10:00
exynos_drm_buf.c drm/exynos: remove 'pages' and 'page_size' elements in exynos gem buffer 2012-12-05 14:39:20 +09:00
exynos_drm_buf.h drm/exynos: remove 'pages' and 'page_size' elements in exynos gem buffer 2012-12-05 14:39:20 +09:00
exynos_drm_connector.c drm/exynos: fix display on issue 2012-10-31 06:11:29 -07:00
exynos_drm_connector.h drm/exynos: fix display power call issue. 2012-10-04 10:06:01 +09:00
exynos_drm_core.c Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next 2012-10-07 21:06:33 +10:00
exynos_drm_crtc.c drm/exynos: hold event_lock while accessing pageflip_event_list 2012-11-29 03:30:33 -08:00
exynos_drm_crtc.h drm/exynos: update overlay via plane from crtc 2012-07-27 11:13:53 +09:00
exynos_drm_dmabuf.c drm/exynos: remove 'pages' and 'page_size' elements in exynos gem buffer 2012-12-05 14:39:20 +09:00
exynos_drm_dmabuf.h drm/exynos: added drm prime feature. 2012-05-08 18:46:32 +09:00
exynos_drm_drv.c drm/exynos: add iommu support for exynos drm framework 2012-11-29 03:30:35 -08:00
exynos_drm_drv.h drm/exynos: add userptr feature for g2d module 2012-12-04 14:46:01 +09:00
exynos_drm_encoder.c Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next 2012-12-10 20:03:58 +10:00
exynos_drm_encoder.h drm/exynos: make sure that overlay data are updated 2012-12-05 14:39:19 +09:00
exynos_drm_fb.c drm/exynos: make sure that overlay data are updated 2012-12-05 14:39:19 +09:00
exynos_drm_fb.h drm/exynos: check NV12M format specific to Exynos properly 2012-10-04 10:06:00 +09:00
exynos_drm_fbdev.c drm/exynos: use sgt instead of pages for framebuffer address 2012-12-05 14:39:21 +09:00
exynos_drm_fbdev.h DRM: add DRM Driver for Samsung SoC EXYNOS4210. 2011-10-05 10:27:31 +01:00
exynos_drm_fimd.c drm/exynos: Use devm_clk_get in exynos_drm_fimd.c 2012-12-05 14:39:22 +09:00
exynos_drm_g2d.c drm/exynos: Fix potential NULL pointer dereference 2012-12-05 14:39:21 +09:00
exynos_drm_g2d.h drm/exynos: add G2D driver 2012-05-17 20:14:48 +09:00
exynos_drm_gem.c drm/exynos: remove 'pages' and 'page_size' elements in exynos gem buffer 2012-12-05 14:39:20 +09:00
exynos_drm_gem.h drm/exynos: remove 'pages' and 'page_size' elements in exynos gem buffer 2012-12-05 14:39:20 +09:00
exynos_drm_hdmi.c drm/exynos: add iommu support for hdmi driver 2012-12-04 14:45:53 +09:00
exynos_drm_hdmi.h drm/exynos: add iommu support for hdmi driver 2012-12-04 14:45:53 +09:00
exynos_drm_iommu.c drm/exynos: add iommu support for exynos drm framework 2012-11-29 03:30:35 -08:00
exynos_drm_iommu.h drm/exynos: add iommu support for exynos drm framework 2012-11-29 03:30:35 -08:00
exynos_drm_plane.c drm/exynos: remove unnecessary code. 2012-11-29 03:30:33 -08:00
exynos_drm_plane.h drm/exynos: add plane enable/disable 2012-07-27 11:13:54 +09:00
exynos_drm_vidi.c drm/exynos: fix lockdep for event_lock wrt. vbl_time_lock 2012-11-29 03:30:34 -08:00
exynos_drm_vidi.h drm/exynos: added virtual display driver. 2012-03-21 10:15:49 +00:00
exynos_hdmi.c drm/exynos: sending AVI and AUI info frames 2012-12-05 14:39:23 +09:00
exynos_hdmi.h drm/exynos: cleanup exynos_hdmi.h 2012-03-20 09:41:45 +00:00
exynos_hdmiphy.c Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next 2012-10-07 21:06:33 +10:00
exynos_mixer.c drm/exynos: Use devm_clk_get in exynos_mixer.c 2012-12-05 14:39:22 +09:00
regs-hdmi.h drm/exynos: sending AVI and AUI info frames 2012-12-05 14:39:23 +09:00
regs-mixer.h drm: exynos: hdmi: add support for exynos5 mixer 2012-10-05 19:15:10 +09:00
regs-vp.h drm/exynos: added hdmi display support 2011-12-29 11:21:42 +09:00