Merge tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel...

Ofc I promise just a few leftovers for drm-misc and somehow it's the
biggest pull. But really mostly trivial stuff:
- MAINTAINERS updates from Emil
- rename async to nonblock in atomic_commit to avoid the confusion between
  nonblocking ioctl and async flip (= not vblank synced), from Maarten.
  Needs to be regened with newer drivers, but probably only after -rc1 to
  catch them all.
- actually lockless gem_object_free, plus acked driver conversion patches.
  All the trickier prep stuff already is in drm-next.
- Noralf's nice work for generic defio support in our fbdev emulation.
  Keeps the udl hack, and qxl is tested by Gerd.

* tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel: (47 commits)
  drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked
  drm/etnaviv: Use lockless gem BO free callback
  drm/imx: Use lockless gem BO free callback
  drm/radeon: Use lockless gem BO free callback
  drm/amdgpu: Use lockless gem BO free callback
  drm/gem: support BO freeing without dev->struct_mutex
  MAINTAINERS: Add myself for the new VC4 (RPi GPU) graphics driver.
  MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers
  MAINTAINERS: Add a few DRM drivers by Dave Airlie
  MAINTAINERS: List the correct git repo for the Renesas DRM drivers
  MAINTAINERS: Update the files list for the Renesas DRM drivers
  MAINTAINERS: Update the files list for the Armada DRM driver
  MAINTAINERS: Update the files list for the Rockchip DRM driver
  MAINTAINERS: Update the files list for the Exynos DRM driver
  MAINTAINERS: Add maintainer entry for the VMWGFX DRM driver
  MAINTAINERS: Add maintainer entry for the MSM DRM driver
  MAINTAINERS: Add maintainer entry for the Nouveau DRM driver
  MAINTAINERS: Update the files list for the Etnaviv DRM driver
  MAINTAINERS: Remove unneded wildcard for the i915 DRM driver
  drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
  ...

diff --cc MAINTAINERS
index f262128644e68b82dd316c0f5ede6224bcc56a1b,1bbf5ece1dd445ef6eb80e51863f4775bddd4f79..8c10b4cc4da7b2c8636f74bed61d2b01cf7beba9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3853,16 -3854,31 +3868,41 @@@ T:   git git://github.com/patjak/drm-gma5
  S:    Maintained
  F:    drivers/gpu/drm/gma500/
  
 +DRM DRIVERS FOR HISILICON
 +M:    Xinliang Liu <[email protected]>
 +R:    Xinwei Kong <[email protected]>
 +R:    Chen Feng <[email protected]>
 +L:    [email protected]
 +T:    git git://github.com/xin3liang/linux.git
 +S:    Maintained
 +F:    drivers/gpu/drm/hisilicon/
 +F:    Documentation/devicetree/bindings/display/hisilicon/
 +
+ DRM DRIVER FOR INTEL I810 VIDEO CARDS
+ S:    Orphan / Obsolete
+ F:    drivers/gpu/drm/i810/
+ F:    include/uapi/drm/i810_drm.h
+ 
+ DRM DRIVER FOR MSM ADRENO GPU
+ M:    Rob Clark <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://people.freedesktop.org/~robclark/linux
+ S:    Maintained
+ F:    drivers/gpu/drm/msm/
+ F:    include/uapi/drm/msm_drm.h
+ F:    Documentation/devicetree/bindings/display/msm/
+ 
+ DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
+ M:    Ben Skeggs <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ T:    git git://github.com/skeggsb/linux
+ S:    Supported
+ F:    drivers/gpu/drm/nouveau/
+ F:    include/uapi/drm/nouveau_drm.h
+ 
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
  M:    Terje Bergström <[email protected]>

diff --cc drivers/gpu/drm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/drm_atomic_helper.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index ff60241b1f768ec1bd9bf5e2d0eed09220ca8422,5d29b838d8d7aacef88cadda967af55aa387a9e6..73299f9e77a81ec01811aa7f38b98c91a853cf6d
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -13462,9 -13414,12 +13462,9 @@@ static int intel_atomic_prepare_commit(
                return ret;
  
        ret = drm_atomic_helper_prepare_planes(dev, state);
 -      if (!ret && !nonblock && !i915_reset_in_progress(&dev_priv->gpu_error)) {
 -              u32 reset_counter;
 -
 -              reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter);
 -              mutex_unlock(&dev->struct_mutex);
 +      mutex_unlock(&dev->struct_mutex);
  
-       if (!ret && !async) {
++      if (!ret && !nonblock) {
                for_each_plane_in_state(state, plane, plane_state, i) {
                        struct intel_plane_state *intel_plane_state =
                                to_intel_plane_state(plane_state);

diff --cc include/drm/drm_crtc.h
Simple merge

diff --cc include/drm/drm_fb_cma_helper.h
Simple merge