Merge tag 'topic/drm-misc-2016-08-31' of git://anongit.freedesktop.org/drm-intel into drm-next

More -misc stuff
- moar drm_crtc.c split up&documentation
- some fixes for the simple kms helpers (Andrea)
- I included all the dri1 patches from David - we're not removing any code
  or drivers, and it seems to have worked as a wake-up call to motivate a
  few more people to upstream kms conversions for these. Feel free to
  revert if you disagree strongly.
- a few other single patches

* tag 'topic/drm-misc-2016-08-31' of git://anongit.freedesktop.org/drm-intel: (24 commits)
  drm: drm_probe_helper: Fix output_poll_work scheduling
  drm: bridge/dw-hdmi: Fix colorspace and scan information registers values
  drm/doc: Polish docs for drm_property&drm_property_blob
  drm: Unify handling of blob and object properties
  drm: Extract drm_property.[hc]
  drm: move drm_mode_legacy_fb_format to drm_fourcc.c
  drm/doc: Polish docs for drm_mode_object
  drm: Remove drm_mode_object->atomic_count
  drm: Extract drm_mode_object.[hc]
  drm/doc: Polish kerneldoc for encoders
  drm: Extract drm_encoder.[hc]
  drm/fb-helper: don't call remove_conflicting_framebuffers for FB=m && DRM=y
  drm/atomic-helper: Add NO_DISABLE_AFTER_MODESET flag support for plane commit
  drm/atomic-helper: Disable appropriate planes in disable_planes_on_crtc()
  drm/atomic-helper: Add atomic_disable CRTC helper callback
  drm: simple_kms_helper: add support for bridges
  drm: simple_kms_helper: make connector optional at init time
  drm/bridge: introduce bridge detaching mechanism
  drm/simple-helpers: Always add planes to the state update
  drm: reduce GETCLIENT to a minimum
  ...

1 files changed, 79 insertions, 57 deletions

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index cbb64d9a82f8..536b5d477c3b 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -108,24 +108,8 @@ config DRM_KMS_CMA_HELPER
 
 source "drivers/gpu/drm/i2c/Kconfig"
 
-config DRM_TDFX
-        tristate "3dfx Banshee/Voodoo3+"
-        depends on DRM && PCI
-        help
-          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
-        select FW_LOADER
-        help
-          Choose this option if you have an ATI Rage 128 graphics card.  If M
-          is selected, the module will be called r128.  AGP support for
-          this card is strongly suggested (unless you have a PCI version).
-
 config DRM_RADEON
         tristate "ATI Radeon"
         depends on DRM && PCI
@@ -166,49 +150,8 @@ source "drivers/gpu/drm/amd/amdgpu/Kconfig"
 
 source "drivers/gpu/drm/nouveau/Kconfig"
 
-config DRM_I810
-        tristate "Intel I810"
-        # !PREEMPT because of missing ioctl locking
-        depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN)
-        help
-          Choose this option if you have an Intel I810 graphics card.  If M is
-          selected, the module will be called i810.  AGP support is required
-          for this driver to work.
-
 source "drivers/gpu/drm/i915/Kconfig"
 
-config DRM_MGA
-        tristate "Matrox g200/g400"
-        depends on DRM && PCI
-        select FW_LOADER
-        help
-          Choose this option if you have a Matrox G200, G400 or G450 graphics
-          card.  If M is selected, the module will be called mga.  AGP
-          support is required for this driver to work.
-
-config DRM_SIS
-        tristate "SiS video cards"
-        depends on DRM && AGP
-        depends on FB_SIS || FB_SIS=n
-        help
-          Choose this option if you have a SiS 630 or compatible video
-          chipset. If M is selected the module will be called sis. AGP
-          support is required for this driver to work.
-
-config DRM_VIA
-        tristate "Via unichrome video cards"
-        depends on DRM && PCI
-        help
-          Choose this option if you have a Via unichrome or compatible video
-          chipset. If M is selected the module will be called via.
-
-config DRM_SAVAGE
-        tristate "Savage video cards"
-        depends on DRM && PCI
-        help
-          Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
-          chipset. If M is selected the module will be called savage.
-
 config DRM_VGEM
         tristate "Virtual GEM provider"
         depends on DRM
@@ -279,3 +222,82 @@ source "drivers/gpu/drm/arc/Kconfig"
 source "drivers/gpu/drm/hisilicon/Kconfig"
 
 source "drivers/gpu/drm/mediatek/Kconfig"
+
+# Keep legacy drivers last
+
+menuconfig DRM_LEGACY
+        bool "Enable legacy drivers (DANGEROUS)"
+        depends on DRM
+        depends on BROKEN
+        help
+          Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous
+          APIs to user-space, which can be used to circumvent access
+          restrictions and other security measures. For backwards compatibility
+          those drivers are still available, but their use is highly
+          inadvisable and might harm your system.
+
+          You are recommended to use the safe modeset-only drivers instead, and
+          perform 3D emulation in user-space.
+
+          Unless you have strong reasons to go rogue, say "N".
+
+if DRM_LEGACY
+
+config DRM_TDFX
+        tristate "3dfx Banshee/Voodoo3+"
+        depends on DRM && PCI
+        help
+          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.
+
+config DRM_R128
+        tristate "ATI Rage 128"
+        depends on DRM && PCI
+        select FW_LOADER
+        help
+          Choose this option if you have an ATI Rage 128 graphics card.  If M
+          is selected, the module will be called r128.  AGP support for
+          this card is strongly suggested (unless you have a PCI version).
+
+config DRM_I810
+        tristate "Intel I810"
+        # !PREEMPT because of missing ioctl locking
+        depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN)
+        help
+          Choose this option if you have an Intel I810 graphics card.  If M is
+          selected, the module will be called i810.  AGP support is required
+          for this driver to work.
+
+config DRM_MGA
+        tristate "Matrox g200/g400"
+        depends on DRM && PCI
+        select FW_LOADER
+        help
+          Choose this option if you have a Matrox G200, G400 or G450 graphics
+          card.  If M is selected, the module will be called mga.  AGP
+          support is required for this driver to work.
+
+config DRM_SIS
+        tristate "SiS video cards"
+        depends on DRM && AGP
+        depends on FB_SIS || FB_SIS=n
+        help
+          Choose this option if you have a SiS 630 or compatible video
+          chipset. If M is selected the module will be called sis. AGP
+          support is required for this driver to work.
+
+config DRM_VIA
+        tristate "Via unichrome video cards"
+        depends on DRM && PCI
+        help
+          Choose this option if you have a Via unichrome or compatible video
+          chipset. If M is selected the module will be called via.
+
+config DRM_SAVAGE
+        tristate "Savage video cards"
+        depends on DRM && PCI
+        help
+          Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
+          chipset. If M is selected the module will be called savage.
+
+endif # DRM_LEGACY