summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/vga/vgaarb.c
diff options
context:
space:
mode:
authorMike Travis2010-02-03 02:45:01 +0100
committerH. Peter Anvin2010-02-06 00:02:47 +0100
commit36028f3383872eefb558a4aae4c12ec2b5fa640f (patch)
treec6716b619537d54991d17bd4296f9e3bd194086e /drivers/gpu/vga/vgaarb.c
parentvgaarb: Fix VGA arbiter to accept PCI domains other than 0 (diff)
downloadkernel-qcow2-linux-36028f3383872eefb558a4aae4c12ec2b5fa640f.tar.gz
kernel-qcow2-linux-36028f3383872eefb558a4aae4c12ec2b5fa640f.tar.xz
kernel-qcow2-linux-36028f3383872eefb558a4aae4c12ec2b5fa640f.zip
vgaarb: Add user selectability of the number of GPUS in a system
Update the VGA Arbiter to allow the user to select the number of GPU's supported in a system. v2: simplify setting of MAX_USER_CARDS, revert back to original default of 16 Signed-off-by: Mike Travis <travis@sgi.com> LKML-Reference: <4B68D51D.6090401@sgi.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Robin Holt <holt@sgi.com> Cc: Jack Steiner <steiner@sgi.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Cc: David Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/gpu/vga/vgaarb.c')
-rw-r--r--drivers/gpu/vga/vgaarb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index ba7fa9ee54dc..325a53364211 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/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)
/*