From 6169847b02ec54be219bb37c6438a089cd5d8120 Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Tue, 2 Feb 2010 17:45:01 -0800
Subject: [PATCH] --- yaml --- r: 182591 b: refs/heads/master c:
 36028f3383872eefb558a4aae4c12ec2b5fa640f h: refs/heads/master i:   182589:
 f7e6c95f6f1da4aac17cb40cd2434e3b8778e681   182587:
 9cf8ab8d4cf44732173f0c4b15e74c4367c2c655   182583:
 ae698e3c6c2229409cae25ff5927aecdafcd7378   182575:
 3374c3b7a20b7db63d63cf8c16756bb4fdacdf05   182559:
 85fa15e8397053e71c84a258068bbd9029dc76cd   182527:
 b993e02ac869b3f571800dcda21c5c8495891ba1 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/gpu/vga/Kconfig  | 8 ++++++++
 trunk/drivers/gpu/vga/vgaarb.c | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dc714870d47e..7880a1a28ff9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 773a38dbdad03474c5ee235f7d9bf9f51c9e3c2b
+refs/heads/master: 36028f3383872eefb558a4aae4c12ec2b5fa640f
diff --git a/trunk/drivers/gpu/vga/Kconfig b/trunk/drivers/gpu/vga/Kconfig
index 790e675b13eb..0920492cea0a 100644
--- a/trunk/drivers/gpu/vga/Kconfig
+++ b/trunk/drivers/gpu/vga/Kconfig
@@ -8,3 +8,11 @@ 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.
diff --git a/trunk/drivers/gpu/vga/vgaarb.c b/trunk/drivers/gpu/vga/vgaarb.c
index ba7fa9ee54dc..325a53364211 100644
--- a/trunk/drivers/gpu/vga/vgaarb.c
+++ b/trunk/drivers/gpu/vga/vgaarb.c
@@ -688,7 +688,7 @@ EXPORT_SYMBOL(vga_client_register);
  * the arbiter.
  */
 
-#define MAX_USER_CARDS         16
+#define MAX_USER_CARDS         CONFIG_VGA_ARB_MAX_GPUS
 #define PCI_INVALID_CARD       ((struct pci_dev *)-1UL)
 
 /*