diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-04-02 22:02:55 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 22:03:08 +0400 |
commit | c9494727cf293ae2ec66af57547a3e79c724fec2 (patch) | |
tree | 44ae197b64fa7530ee695a90ad31326dda06f1e1 /drivers/gpu/vga/Kconfig | |
parent | 6427462bfa50f50dc6c088c07037264fcc73eca1 (diff) | |
parent | 42be79e37e264557f12860fa4cc84b4de3685954 (diff) | |
download | linux-c9494727cf293ae2ec66af57547a3e79c724fec2.tar.xz |
Merge branch 'linus' into sched/core
Merge reason: update to latest upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/vga/Kconfig')
-rw-r--r-- | drivers/gpu/vga/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index 0920492cea0a..61ab4daf0bbb 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -16,3 +16,14 @@ config VGA_ARB_MAX_GPUS 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. |