The patch titled vgaarb: add user selectability of the number of GPUS in a system has been added to the -mm tree. Its filename is vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: vgaarb: add user selectability of the number of GPUS in a system From: Mike Travis <travis@xxxxxxx> 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: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Robin Holt <holt@xxxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Jack Steiner <steiner@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/gpu/vga/Kconfig | 8 ++++++++ drivers/gpu/vga/vgaarb.c | 4 ++++ 2 files changed, 12 insertions(+) diff -puN drivers/gpu/vga/Kconfig~vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system drivers/gpu/vga/Kconfig --- a/drivers/gpu/vga/Kconfig~vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system +++ a/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 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. diff -puN drivers/gpu/vga/vgaarb.c~vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system drivers/gpu/vga/vgaarb.c --- a/drivers/gpu/vga/vgaarb.c~vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system +++ a/drivers/gpu/vga/vgaarb.c @@ -688,7 +688,11 @@ EXPORT_SYMBOL(vga_client_register); * 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) /* _ Patches currently in -mm which might be from travis@xxxxxxx are pci-update-pci_set_vga_state-to-call-arch-functions.patch x86_64-uv-update-uv-arch-to-target-legacy-vga-i-o-correctly.patch vgaarb-fix-vga-arbiter-to-accept-pci-domains-other-than-0.patch vgaarb-add-user-selectability-of-the-number-of-gpus-in-a-system.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html