Linux 2.6.39-rc5

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

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 0902d44600394fd1d6888bd6e5065bda884d2e03..c58f691ec3ce6f4d62aaf3248b6bec39a887c60a 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -73,32 +73,17 @@ source "drivers/gpu/drm/radeon/Kconfig"
 
 config DRM_I810
        tristate "Intel I810"
-       # BKL usage in order to avoid AB-BA deadlocks, may become BROKEN_ON_SMP
-       depends on DRM && AGP && AGP_INTEL && BKL
+       # !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.
 
-choice
-       prompt "Intel 830M, 845G, 852GM, 855GM, 865G"
-       depends on DRM && AGP && AGP_INTEL
-       optional
-
-config DRM_I830
-       tristate "i830 driver"
-       # BKL usage in order to avoid AB-BA deadlocks, i830 may get removed
-       depends on BKL
-       help
-         Choose this option if you have a system that has Intel 830M, 845G,
-         852GM, 855GM or 865G integrated graphics.  If M is selected, the
-         module will be called i830.  AGP support is required for this driver
-         to work. This driver is used by the older X releases X.org 6.7 and
-         XFree86 4.3. If unsure, build this and i915 as modules and the X server
-         will load the correct one.
-
 config DRM_I915
-       tristate "i915 driver"
+       tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
+       depends on DRM
+       depends on AGP
        depends on AGP_INTEL
        # we need shmfs for the swappable backing store, and in particular
        # the shmem_readpage() which depends upon tmpfs
@@ -111,16 +96,25 @@ config DRM_I915
        # i915 depends on ACPI_VIDEO when ACPI is enabled
        # but for select to work, need to select ACPI_VIDEO's dependencies, ick
        select BACKLIGHT_CLASS_DEVICE if ACPI
+       select VIDEO_OUTPUT_CONTROL if ACPI
        select INPUT if ACPI
        select ACPI_VIDEO if ACPI
        select ACPI_BUTTON if ACPI
        help
-         Choose this option if you have a system that has Intel 830M, 845G,
-         852GM, 855GM 865G or 915G 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. If unsure, build this and i830 as modules and
-         the X server will load the correct one.
+         Choose this option if you have a system that has "Intel Graphics
+         Media Accelerator" or "HD Graphics" integrated graphics,
+         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.
+
+         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.
 
 config DRM_I915_KMS
        bool "Enable modesetting on intel by default"
@@ -132,8 +126,6 @@ config DRM_I915_KMS
          the driver to bind to PCI devices, which precludes loading things
          like intelfb.
 
-endchoice
-
 config DRM_MGA
        tristate "Matrox g200/g400"
        depends on DRM && PCI