Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2...

[deliverable/linux.git] / drivers / gpu / drm / Kconfig

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 2418429a98360fd996888e5ccce6189bad9d9a86..cc1148837e241d2c95332a630609a838d9ae59ee 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -18,6 +18,11 @@ menuconfig DRM
          details.  You should also select and configure AGP
          (/dev/agpgart) support if it is available for your platform.
 
+config DRM_USB
+       tristate
+       depends on DRM
+       select USB
+
 config DRM_KMS_HELPER
        tristate
        depends on DRM
@@ -27,6 +32,18 @@ config DRM_KMS_HELPER
        help
          FB and CRTC helpers for KMS drivers.
 
+config DRM_LOAD_EDID_FIRMWARE
+       bool "Allow to specify an EDID data set instead of probing for it"
+       depends on DRM_KMS_HELPER
+       help
+         Say Y here, if you want to use EDID data to be loaded from the
+         /lib/firmware directory or one of the provided built-in
+         data sets. This may be necessary, if the graphics adapter or
+         monitor are unable to provide appropriate EDID data. Since this
+         feature is provided as a workaround for broken hardware, the
+         default case is N. Details and instructions how to build your own
+         EDID data are given in Documentation/EDID/HOWTO.txt.
+
 config DRM_TTM
        tristate
        depends on DRM
@@ -71,6 +88,8 @@ config DRM_RADEON
 
 source "drivers/gpu/drm/radeon/Kconfig"
 
+source "drivers/gpu/drm/nouveau/Kconfig"
+
 config DRM_I810
        tristate "Intel I810"
        # !PREEMPT because of missing ioctl locking
@@ -165,3 +184,4 @@ source "drivers/gpu/drm/vmwgfx/Kconfig"
 
 source "drivers/gpu/drm/gma500/Kconfig"
 
+source "drivers/gpu/drm/udl/Kconfig"