1 files changed, 17 insertions, 0 deletions

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index a8b33c2ec8d2..5130b72d593c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -7,6 +7,8 @@
 menuconfig DRM
         tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
         depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
+        select I2C
+        select I2C_ALGOBIT
         help
           Kernel-level support for the Direct Rendering Infrastructure (DRI)
           introduced in XFree86 4.0. If you say Y here, you need to select
@@ -65,6 +67,10 @@ config DRM_I830
           will load the correct one.
 
 config DRM_I915
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        depends on FB
         tristate "i915 driver"
         help
           Choose this option if you have a system that has Intel 830M, 845G,
@@ -76,6 +82,17 @@ config DRM_I915
 
 endchoice
 
+config DRM_I915_KMS
+        bool "Enable modesetting on intel by default"
+        depends on DRM_I915
+        help
+        Choose this option if you want kernel modesetting enabled by default,
+        and you have a new enough userspace to support this. Running old
+        userspaces with this enabled will cause pain.  Note that this causes
+        the driver to bind to PCI devices, which precludes loading things
+        like intelfb.
+
+
 config DRM_MGA
         tristate "Matrox g200/g400"
         depends on DRM