Merge tag 'gvt-next-2016-10-27' of https://github.com/01org/gvt-linux into drm-intel...

[karo-tx-linux.git] / drivers / gpu / drm / i915 / Kconfig

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index c72b007c2048dfb9e3a4290aca1a6240468b64e6..df96aed6975a8caa613156839e98b1bde8c6349c 100644 (file)
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -4,7 +4,6 @@ config DRM_I915
        depends on X86 && PCI
        select INTEL_GTT
        select INTERVAL_TREE
-       select STOP_MACHINE
        # we need shmfs for the swappable backing store, and in particular
        # the shmem_readpage() which depends upon tmpfs
        select SHMEM
@@ -12,6 +11,7 @@ config DRM_I915
        select DRM_KMS_HELPER
        select DRM_PANEL
        select DRM_MIPI_DSI
+       select RELAY
        # i915 depends on ACPI_VIDEO when ACPI is enabled
        # but for select to work, need to select ACPI_VIDEO's dependencies, ick
        select BACKLIGHT_LCD_SUPPORT if ACPI
@@ -25,16 +25,17 @@ config DRM_I915
          including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
          G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
          Core i5, Core i7 as well as Atom CPUs with integrated graphics.
-         If M is selected, the module will be called i915.  AGP support
-         is required for this driver to work. This driver is used by
-         the Intel driver in X.org 6.8 and XFree86 4.4 and above. It
-         replaces the older i830 module that supported a subset of the
-         hardware in older X.org releases.
+
+         This driver is used by the Intel driver in X.org 6.8 and
+         XFree86 4.4 and above. It replaces the older i830 module that
+         supported a subset of the hardware in older X.org releases.
 
          Note that the older i810/i815 chipsets require the use of the
          i810 driver instead, and the Atom z5xx series has an entirely
          different implementation.
 
+         If "M" is selected, the module will be called i915.
+
 config DRM_I915_PRELIMINARY_HW_SUPPORT
        bool "Enable preliminary support for prerelease Intel hardware by default"
        depends on DRM_I915