Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6.git] / drivers / gpu / vga / Kconfig

diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 790e675b13eb8f4b16e9b7040bd656759473ae93..61ab4daf0bbb9adb18190e1ff16617183bb5d1f0 100644 (file)
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -8,3 +8,22 @@ config VGA_ARB
          are accessed at same time they need some kind of coordination. Please
          see Documentation/vgaarbiter.txt for more details. Select this to
          enable VGA arbiter.
+
+config VGA_ARB_MAX_GPUS
+       int "Maximum number of GPUs"
+       default 16
+       depends on VGA_ARB
+       help
+         Reserves space in the kernel to maintain resource locking for
+         multiple GPUS.  The overhead for each GPU is very small.
+
+config VGA_SWITCHEROO
+       bool "Laptop Hybrid Grapics - GPU switching support"
+       depends on X86
+       depends on ACPI
+       help
+         Many laptops released in 2008/9/10 have two gpus with a multiplxer
+         to switch between them. This adds support for dynamic switching when
+          X isn't running and delayed switching until the next logoff. This
+         features is called hybrid graphics, ATI PowerXpress, and Nvidia
+         HybridPower.