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

Misc stuff all over:
- more mode_fixup removal from Carlos, there's another final pile still
  left.
- final bits of vgaswitcheroo from Lukas for apple gmux, we're still
  discussing an api cleanup patch to make it a bit more abuse-safe as a
  follow-up
- dp aux interface for userspace for tools&tests from Rafael Antognolli
- actual interface parts for dma-buf flushing for userspace mmap
- few small bits all over

- vgaswitcheroo support for apple gmux from Lukas Wunner
- checks for ->mode_fixup in non-atomic helpers from Carlos Palminha, plus
  removing dummy funcs from drivers. Carlos promised to follow up with
  more, since there's lots more silly dummy functions around.
- dma-buf patches from Tiago, except the ioctl itself (that needed a
  respin to address review from David Herrmann)
- encoder mask for atomic from Maarten
- bunch of random things all over.

* tag 'topic/drm-misc-2016-02-18' of git://anongit.freedesktop.org/drm-intel: (57 commits)
  drm/udl: Use module_usb_driver
  drm: fixes crct set_mode when crtc mode_fixup is null.
  drm/tilcdc: removed optional dummy encoder mode_fixup function.
  drm/sti: removed optional dummy encoder mode_fixup function.
  drm/rockchip: removed optional dummy encoder mode_fixup function.
  drm/qxl: removed optional dummy encoder mode_fixup function.
  drm/mgag200: removed optional dummy encoder mode_fixup function.
  drm/msm/mdp: removed optional dummy encoder mode_fixup function.
  drm/imx: removed optional dummy encoder mode_fixup function.
  drm/gma500: removed optional dummy encoder mode_fixup function.
  drm/radeon: removed optional dummy encoder mode_fixup function.
  drm/cirrus: removed optional dummy encoder mode_fixup function.
  drm/bochs: removed optional dummy encoder mode_fixup function.
  drm/ast: removed optional dummy encoder mode_fixup function.
  drm/amdgpu: removed optional dummy encoder mode_fixup function.
  drm/exynos: removed optional dummy encoder mode_fixup function.
  drm/udl: removed optional dummy encoder mode_fixup function.
  drm/virtio: removed optional dummy encoder mode_fixup function.
  drm/fb_helper: Use add_one_connector in add_all_connectors.
  drm/fb_helper: Use correct allocation count for arrays.
  ...

diff --combined drivers/gpu/drm/Kconfig
index 438e92d4c389cb762fefad5c400acde0a4f32c93,7b1560792e6a4e5c3ed360a5fc6774e2c71bccc6..08706f064e6ea7984cbce9976a89a80f194e1b2f
--- 1/drivers/gpu/drm/Kconfig
--- 2/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -25,6 -25,14 +25,14 @@@ config DRM_MIPI_DS
        bool
        depends on DRM
  
+ config DRM_DP_AUX_CHARDEV
+       bool "DRM DP AUX Interface"
+       depends on DRM
+       help
+         Choose this option to enable a /dev/drm_dp_auxN node that allows to
+         read and write values to arbitrary DPCD registers on the DP aux
+         channel.
+ 
  config DRM_KMS_HELPER
        tristate
        depends on DRM
@@@ -106,8 -114,6 +114,8 @@@ config DRM_TDF
          Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
          graphics card.  If M is selected, the module will be called tdfx.
  
 +source "drivers/gpu/drm/arm/Kconfig"
 +
  config DRM_R128
        tristate "ATI Rage 128"
        depends on DRM && PCI

diff --combined drivers/gpu/drm/Makefile
index f80fdbaeb64124482cb11a5fba18c81d570b1ae7,e07fd93981e16cb563d5f4ca04f850f303845697..6eb94fc561dc29ba187baefb8a1368db2b550dbb
--- 1/drivers/gpu/drm/Makefile
--- 2/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -22,10 -22,13 +22,13 @@@ drm-$(CONFIG_OF) += drm_of.
  drm-$(CONFIG_AGP) += drm_agpsupport.o
  
  drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \
-               drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o
+               drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \
+               drm_kms_helper_common.o
+ 
  drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
  drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
  drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
+ drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
  
  obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
  
@@@ -33,7 -36,6 +36,7 @@@ CFLAGS_drm_trace_points.o := -I$(src
  
  obj-$(CONFIG_DRM)     += drm.o
  obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o
 +obj-$(CONFIG_DRM_ARM) += arm/
  obj-$(CONFIG_DRM_TTM) += ttm/
  obj-$(CONFIG_DRM_TDFX)        += tdfx/
  obj-$(CONFIG_DRM_R128)        += r128/