From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Apr 2014 16:52:16 +0000 (-0700)
Subject: Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v3.15-rc1~51
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e9f37d3a8d126e73f5737ef548cdf6f618e295e4;p=linux-2.6-block.git

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "Highlights:

   - drm:

     Generic display port aux features, primary plane support, drm
     master management fixes, logging cleanups, enforced locking checks
     (instead of docs), documentation improvements, minor number
     handling cleanup, pseudofs for shared inodes.

   - ttm:

     add ability to allocate from both ends

   - i915:

     broadwell features, power domain and runtime pm, per-process
     address space infrastructure (not enabled)

   - msm:

     power management, hdmi audio support

   - nouveau:

     ongoing GPU fault recovery, initial maxwell support, random fixes

   - exynos:

     refactored driver to clean up a lot of abstraction, DP support
     moved into drm, LVDS bridge support added, parallel panel support

   - gma500:

     SGX MMU support, SGX irq handling, asle irq work fixes

   - radeon:

     video engine bringup, ring handling fixes, use dp aux helpers

   - vmwgfx:

     add rendernode support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (849 commits)
  DRM: armada: fix corruption while loading cursors
  drm/dp_helper: don't return EPROTO for defers (v2)
  drm/bridge: export ptn3460_init function
  drm/exynos: remove MODULE_DEVICE_TABLE definitions
  ARM: dts: exynos4412-trats2: enable exynos/fimd node
  ARM: dts: exynos4210-trats: enable exynos/fimd node
  ARM: dts: exynos4412-trats2: add panel node
  ARM: dts: exynos4210-trats: add panel node
  ARM: dts: exynos4: add MIPI DSI Master node
  drm/panel: add S6E8AA0 driver
  ARM: dts: exynos4210-universal_c210: add proper panel node
  drm/panel: add ld9040 driver
  panel/ld9040: add DT bindings
  panel/s6e8aa0: add DT bindings
  drm/exynos: add DSIM driver
  exynos/dsim: add DT bindings
  drm/exynos: disallow fbdev initialization if no device is connected
  drm/mipi_dsi: create dsi devices only for nodes with reg property
  drm/mipi_dsi: add flags to DSI messages
  Skip intel_crt_init for Dell XPS 8700
  ...
---

e9f37d3a8d126e73f5737ef548cdf6f618e295e4
diff --cc drivers/gpu/drm/drm_crtc_helper.c
index f7a81209beb3,1fbe8427c70e..c43825e8f5c1
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@@ -560,11 -565,8 +565,8 @@@ drm_crtc_helper_disable(struct drm_crt
   * drm_crtc_helper_set_config - set a new config from userspace
   * @set: mode set configuration
   *
-  * LOCKING:
-  * Caller must hold mode config lock.
-  *
   * Setup a new configuration, provided by the upper layers (either an ioctl call
 - * from userspace or internally e.g. from the fbdev suppport code) in @set, and
 + * from userspace or internally e.g. from the fbdev support code) in @set, and
   * enable it. This is the main helper functions for drivers that implement
   * kernel mode setting with the crtc helper functions and the assorted
   * ->prepare(), ->modeset() and ->commit() helper callbacks.
diff --cc drivers/gpu/drm/gma500/mmu.c
index c3e67ba94446,3e14a9b35252..0eaf11c19939
--- a/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@@ -520,7 -478,8 +478,8 @@@ struct psb_mmu_driver *psb_mmu_driver_i
  
  	driver->has_clflush = 0;
  
+ #if defined(CONFIG_X86)
 -	if (boot_cpu_has(X86_FEATURE_CLFLSH)) {
 +	if (boot_cpu_has(X86_FEATURE_CLFLUSH)) {
  		uint32_t tfms, misc, cap0, cap4, clflush_size;
  
  		/*