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

[mv-sheeva.git] / drivers / gpu / vga / Kconfig

diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 34b08a6b0cbebccd06248b4c06fc865993a3e89f..61ab4daf0bbb9adb18190e1ff16617183bb5d1f0 100644 (file)
--- 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.
-