From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 31 Mar 2014 14:23:03 +0000 (+0200)
Subject: drm/i915: Deprecate UMS harder
X-Git-Tag: next-20140428~44^2~137
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c7b78e6f237859a9326e6dd11b2a43b3d83f8e23;p=karo-tx-linux.git

drm/i915: Deprecate UMS harder

Progess according to the deprecation plan laid out in

commit b30324adaf8d2e5950a602bde63030d15a61826f
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Wed Nov 13 22:11:25 2013 +0100

    drm/i915: Deprecated UMS support

and disable UMS for 3.16. Note that it has been over 5 years since the
last UMS-supporting piece of userspace was released.

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 73ed59eff139..7213c38a4d91 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -72,7 +72,7 @@ config DRM_I915_PRELIMINARY_HW_SUPPORT
 
 config DRM_I915_UMS
 	bool "Enable userspace modesetting on Intel hardware (DEPRECATED)"
-	depends on DRM_I915
+	depends on DRM_I915 && BROKEN
 	default n
 	help
 	  Choose this option if you still need userspace modesetting.