Merge tag 'drm-for-v4.10' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "This is the main pull request for drm for 4.10 kernel.

  New drivers:
   - ZTE VOU display driver (zxdrm)
   - Amlogic Meson Graphic Controller GXBB/GXL/GXM SoCs (meson)
   - MXSFB support (mxsfb)

  Core:
   - Format handling has been reworked
   - Better atomic state debugging
   - drm_mm leak debugging
   - Atomic explicit fencing support
   - fbdev helper ops
   - Documentation updates
   - MST fbcon fixes

  Bridge:
   - Silicon Image SiI8620 driver

  Panel:
   - Add support for new simple panels

  i915:
   - GVT Device model
   - Better HDMI2.0 support on skylake
   - More watermark fixes
   - GPU idling rework for suspend/resume
   - DP Audio workarounds
   - Scheduler prep-work
   - Opregion CADL handling
   - GPU scheduler and priority boosting

  amdgfx/radeon:
   - Support for virtual devices
   - New VM manager for non-contig VRAM buffers
   - UVD powergating
   - SI register header cleanup
   - Cursor fixes
   - Powermanagement fixes

  nouveau:
   - Powermangement reworks for better voltage/clock changes
   - Atomic modesetting support
   - Displayport Multistream (MST) support.
   - GP102/104 hang and cursor fixes
   - GP106 support

  hisilicon:
   - hibmc support (BMC chip for aarch64 servers)

  armada:
   - add tracing support for overlay change
   - refactor plane support
   - de-midlayer the driver

  omapdrm:
   - Timing code cleanups

  rcar-du:
   - R8A7792/R8A7796 support
   - Misc fixes.

  sunxi:
   - A31 SoC display engine support

  imx-drm:
   - YUV format support
   - Cleanup plane atomic update

  mali-dp:
   - Misc fixes

  dw-hdmi:
   - Add support for HDMI i2c master controller

  tegra:
   - IOMMU support fixes
   - Error handling fixes

  tda998x:
   - Fix connector registration
   - Improved robustness
   - Fix infoframe/audio compliance

  virtio:
   - fix busid issues
   - allocate more vbufs

  qxl:
   - misc fixes and cleanups.

  vc4:
   - Fragment shader threading
   - ETC1 support
   - VEC (tv-out) support

  msm:
   - A5XX GPU support
   - Lots of atomic changes

  tilcdc:
   - Misc fixes and cleanups.

  etnaviv:
   - Fix dma-buf export path
   - DRAW_INSTANCED support
   - fix driver on i.MX6SX

  exynos:
   - HDMI refactoring

  fsl-dcu:
   - fbdev changes"

* tag 'drm-for-v4.10' of git://people.freedesktop.org/~airlied/linux: (1343 commits)
  drm/nouveau/kms/nv50: fix atomic regression on original G80
  drm/nouveau/bl: Do not register interface if Apple GMUX detected
  drm/nouveau/bl: Assign different names to interfaces
  drm/nouveau/bios/dp: fix handling of LevelEntryTableIndex on DP table 4.2
  drm/nouveau/ltc: protect clearing of comptags with mutex
  drm/nouveau/gr/gf100-: handle GPC/TPC/MPC trap
  drm/nouveau/core: recognise GP106 chipset
  drm/nouveau/ttm: wait for bo fence to signal before unmapping vmas
  drm/nouveau/gr/gf100-: FECS intr handling is not relevant on proprietary ucode
  drm/nouveau/gr/gf100-: properly ack all FECS error interrupts
  drm/nouveau/fifo/gf100-: recover from host mmu faults
  drm: Add fake controlD* symlinks for backwards compat
  drm/vc4: Don't use drm_put_dev
  drm/vc4: Document VEC DT binding
  drm/vc4: Add support for the VEC (Video Encoder) IP
  drm: Add TV connector states to drm_connector_state
  drm: Turn DRM_MODE_SUBCONNECTOR_xx definitions into an enum
  drm/vc4: Fix ->clock_select setting for the VEC encoder
  drm/amdgpu/dce6: Set MASTER_UPDATE_MODE to 0 in resume_mc_access as well
  drm/amdgpu: use pin rather than pin_restricted in a few cases
  ...

diff --cc Documentation/gpu/drm-kms.rst
Simple merge

diff --cc MAINTAINERS
index 21a7e7e0aef0658158fdf4fb6b021a5f9bd88abf,1a7a773114aa26b274adab6a3106921c63fd5ab2..81d597ca73c66c12e6f290344f1e4ca10d7c495a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4084,10 -4088,7 +4105,9 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Daniel Vetter <daniel.vetter@intel.com>
  M:    Jani Nikula <jani.nikula@linux.intel.com>
  L:    intel-gfx@lists.freedesktop.org
- L:    dri-devel@lists.freedesktop.org
  W:    https://01.org/linuxgraphics/
 +B:    https://01.org/linuxgraphics/documentation/how-report-bugs
 +C:    irc://chat.freenode.net/intel-gfx
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://anongit.freedesktop.org/drm-intel
  S:    Supported

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc drivers/base/Kconfig
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/include/cgs_common.h
index df7c18b6a02a199bc9eda3fdec4f2406f5aabdf8,e4a1697ec1d31f4d04e5995c2975c4f2ef9fb745..e4a1697ec1d31f4d04e5995c2975c4f2ef9fb745
mode 100644,100755..100644
--- 1/drivers/gpu/drm/amd/include/cgs_common.h
--- 2/drivers/gpu/drm/amd/include/cgs_common.h
+++ b/drivers/gpu/drm/amd/include/cgs_common.h

diff --cc drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
index 02fe1df855a92b588df4faa3ac8543f64f26d357,26eff56b4a99dd0ffba3f4d35a44cce8001d296b..26eff56b4a99dd0ffba3f4d35a44cce8001d296b
mode 100644,100755..100644
--- 1/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
--- 2/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c

diff --cc drivers/gpu/drm/i915/i915_gem_request.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_shrinker.c
index c450076d2f9bc39c640702ff7a39405d752a7e40,a6fc1bdc48af9a332ed2f5d6d7c95544c17000c2..401006b4c6a36bf2a8058c2b47eb38105ab5baf4
--- 1/drivers/gpu/drm/i915/i915_gem_shrinker.c
--- 2/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@@ -35,6 -35,33 +35,24 @@@
  #include "i915_drv.h"
  #include "i915_trace.h"
  
 -static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
++static bool i915_gem_shrinker_lock(struct drm_device *dev, bool *unlock)
+ {
 -      if (!mutex_is_locked(mutex))
++      switch (mutex_trylock_recursive(&dev->struct_mutex)) {
++      case MUTEX_TRYLOCK_FAILED:
+               return false;
+ 
 -#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
 -      return mutex->owner == task;
 -#else
 -      /* Since UP may be pre-empted, we cannot assume that we own the lock */
 -      return false;
 -#endif
 -}
 -
 -static bool i915_gem_shrinker_lock(struct drm_device *dev, bool *unlock)
 -{
 -      if (!mutex_trylock(&dev->struct_mutex)) {
 -              if (!mutex_is_locked_by(&dev->struct_mutex, current))
 -                      return false;
++      case MUTEX_TRYLOCK_SUCCESS:
++              *unlock = true;
++              return true;
+ 
++      case MUTEX_TRYLOCK_RECURSIVE:
+               *unlock = false;
 -      } else {
 -              *unlock = true;
++              return true;
+       }
+ 
 -      return true;
++      BUG();
+ }
+ 
  static bool any_vma_pinned(struct drm_i915_gem_object *obj)
  {
        struct i915_vma *vma;