summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/vga/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-09 08:17:32 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-09 08:17:32 +0100
commitce67eef6a112bb283c6db39f9195800f31f5599a (patch)
tree34f2e7fbd0b9838abba482dbb1a7db09e6fbb53c /drivers/gpu/vga/Kconfig
parentInput: wacom - merge out and in prox events (diff)
parentLinux 2.6.34-rc1 (diff)
downloadlinux-ce67eef6a112bb283c6db39f9195800f31f5599a.tar.xz
linux-ce67eef6a112bb283c6db39f9195800f31f5599a.zip
Merge commit 'v2.6.34-rc1' into for-linus
Diffstat (limited to 'drivers/gpu/vga/Kconfig')
-rw-r--r--drivers/gpu/vga/Kconfig19
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 790e675b13eb..61ab4daf0bbb 100644
--- 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.