diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:59:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 13:59:18 -0500 |
commit | c7e15899d07c9813c1aa96b21699d2d9c8314c4b (patch) | |
tree | 16e9b4dceddf1b4d1dad05588d700c70cf8fcb88 /arch/x86/kernel/bios_uv.c | |
parent | f6a0b5cd34d6e922cc7258c5429fb0f17508ceb6 (diff) | |
parent | 78c06176466cbd1b3f0f67709d3023c40dbebcbd (diff) |
Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Enable NMI on all cpus on UV
vgaarb: Add user selectability of the number of GPUS in a system
vgaarb: Fix VGA arbiter to accept PCI domains other than 0
x86, uv: Update UV arch to target Legacy VGA I/O correctly.
pci: Update pci_set_vga_state() to call arch functions
Diffstat (limited to 'arch/x86/kernel/bios_uv.c')
-rw-r--r-- | arch/x86/kernel/bios_uv.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/kernel/bios_uv.c b/arch/x86/kernel/bios_uv.c index b0206a211b09..575127a6e352 100644 --- a/arch/x86/kernel/bios_uv.c +++ b/arch/x86/kernel/bios_uv.c | |||
@@ -154,6 +154,25 @@ s64 uv_bios_freq_base(u64 clock_type, u64 *ticks_per_second) | |||
154 | } | 154 | } |
155 | EXPORT_SYMBOL_GPL(uv_bios_freq_base); | 155 | EXPORT_SYMBOL_GPL(uv_bios_freq_base); |
156 | 156 | ||
157 | /* | ||
158 | * uv_bios_set_legacy_vga_target - Set Legacy VGA I/O Target | ||
159 | * @decode: true to enable target, false to disable target | ||
160 | * @domain: PCI domain number | ||
161 | * @bus: PCI bus number | ||
162 | * | ||
163 | * Returns: | ||
164 | * 0: Success | ||
165 | * -EINVAL: Invalid domain or bus number | ||
166 | * -ENOSYS: Capability not available | ||
167 | * -EBUSY: Legacy VGA I/O cannot be retargeted at this time | ||
168 | */ | ||
169 | int uv_bios_set_legacy_vga_target(bool decode, int domain, int bus) | ||
170 | { | ||
171 | return uv_bios_call(UV_BIOS_SET_LEGACY_VGA_TARGET, | ||
172 | (u64)decode, (u64)domain, (u64)bus, 0, 0); | ||
173 | } | ||
174 | EXPORT_SYMBOL_GPL(uv_bios_set_legacy_vga_target); | ||
175 | |||
157 | 176 | ||
158 | #ifdef CONFIG_EFI | 177 | #ifdef CONFIG_EFI |
159 | void uv_bios_init(void) | 178 | void uv_bios_init(void) |