Update the VGA Arbiter to allow the user to select the number of GPU's supported in a system. Signed-off-by: Mike Travis <travis@xxxxxxx> Cc: Dave Airlie <airlied@xxxxxxxxxx> Cc: Alex Chiang <achiang@xxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Robin Holt <holt@xxxxxxx> Cc: Rafael J. Wysocki <rjw@xxxxxxx> Cc: Adam Jackson <ajax@xxxxxxxx> Cc: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Gaetan Nadon <memsize@xxxxxxxxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Aaron Plattner <aplattner@xxxxxxxxxx> Cc: Jack Steiner <steiner@xxxxxxx> Cc: Tiago Vignatti <tiago.vignatti@xxxxxxxxx> Cc: Cliff Wickman <cpw@xxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxxxx> Cc: Christian Zander <chzander@xxxxxxxxxx> Cc: Yu Zhao <yu.zhao@xxxxxxxxx> Cc: linux-kernel@xxxxxxxxxxxxxxx Cc: linux-pci@xxxxxxxxxxxxxxx Cc: x86@xxxxxxxxxx --- drivers/gpu/vga/Kconfig | 8 ++++++++ drivers/gpu/vga/vgaarb.c | 4 ++++ 2 files changed, 12 insertions(+) --- linux.orig/drivers/gpu/vga/Kconfig +++ linux/drivers/gpu/vga/Kconfig @@ -8,3 +8,11 @@ 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 64 + 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. --- linux.orig/drivers/gpu/vga/vgaarb.c +++ linux/drivers/gpu/vga/vgaarb.c @@ -688,7 +688,11 @@ * the arbiter. */ +#ifdef CONFIG_VGA_ARB_MAX_GPUS +#define MAX_USER_CARDS CONFIG_VGA_ARB_MAX_GPUS +#else #define MAX_USER_CARDS 16 +#endif #define PCI_INVALID_CARD ((struct pci_dev *)-1UL) /* -- -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html