From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934104Ab0BEW7j (ORCPT ); Fri, 5 Feb 2010 17:59:39 -0500 Received: from hera.kernel.org ([140.211.167.34]:58878 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933923Ab0BEW7d (ORCPT ); Fri, 5 Feb 2010 17:59:33 -0500 Date: Fri, 5 Feb 2010 22:58:22 GMT From: tip-bot for Mike Travis Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, travis@sgi.com, holt@sgi.com, airlied@linux.ie, akpm@linux-foundation.org, steiner@sgi.com, jbarnes@virtuousgeek.org, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, travis@sgi.com, holt@sgi.com, airlied@linux.ie, jbarnes@virtuousgeek.org, akpm@linux-foundation.org, steiner@sgi.com, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <201002022238.o12McG1F018733@imap1.linux-foundation.org> References: <201002022238.o12McG1F018733@imap1.linux-foundation.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pci] vgaarb: Add user selectability of the number of GPUS in a system Message-ID: Git-Commit-ID: 5f95078a35e5857afa294a558c277196cf079668 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Fri, 05 Feb 2010 22:58:23 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5f95078a35e5857afa294a558c277196cf079668 Gitweb: http://git.kernel.org/tip/5f95078a35e5857afa294a558c277196cf079668 Author: Mike Travis AuthorDate: Tue, 2 Feb 2010 14:38:16 -0800 Committer: H. Peter Anvin CommitDate: Fri, 5 Feb 2010 14:05:41 -0800 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. Signed-off-by: Mike Travis LKML-Reference: <201002022238.o12McG1F018733@imap1.linux-foundation.org> Cc: Thomas Gleixner Cc: Robin Holt Cc: Jack Steiner Cc: Ingo Molnar Cc: Jesse Barnes Cc: David Airlie Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin --- drivers/gpu/vga/Kconfig | 8 ++++++++ drivers/gpu/vga/vgaarb.c | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index 790e675..cb1dcfe 100644 --- a/drivers/gpu/vga/Kconfig +++ b/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 --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index ba7fa9e..541fdfd 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/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) /*