diff options
author | Mike Travis <travis@sgi.com> | 2010-02-02 20:45:01 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-05 18:02:47 -0500 |
commit | 36028f3383872eefb558a4aae4c12ec2b5fa640f (patch) | |
tree | c6716b619537d54991d17bd4296f9e3bd194086e /drivers/gpu/vga/vgaarb.c | |
parent | 773a38dbdad03474c5ee235f7d9bf9f51c9e3c2b (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index ba7fa9ee54d..325a5336421 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c | |||
@@ -688,7 +688,7 @@ EXPORT_SYMBOL(vga_client_register); | |||
688 | * the arbiter. | 688 | * the arbiter. |
689 | */ | 689 | */ |
690 | 690 | ||
691 | #define MAX_USER_CARDS 16 | 691 | #define MAX_USER_CARDS CONFIG_VGA_ARB_MAX_GPUS |
692 | #define PCI_INVALID_CARD ((struct pci_dev *)-1UL) | 692 | #define PCI_INVALID_CARD ((struct pci_dev *)-1UL) |
693 | 693 | ||
694 | /* | 694 | /* |