diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-31 14:55:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 14:55:14 +1000 |
| commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
| tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /drivers/gpu/vga/Kconfig | |
| parent | c414a117c6094c3f86b533f97beaf45ef9075f03 (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'drivers/gpu/vga/Kconfig')
| -rw-r--r-- | drivers/gpu/vga/Kconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index 34b08a6b0cb..61ab4daf0bb 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -9,6 +9,14 @@ config VGA_ARB 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 @@ -19,4 +27,3 @@ config VGA_SWITCHEROO X isn't running and delayed switching until the next logoff. This features is called hybrid graphics, ATI PowerXpress, and Nvidia HybridPower. - |