diff options
author | Mike Travis <travis@sgi.com> | 2010-02-02 17:38:13 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-26 10:47:59 -0400 |
commit | 2f27df301575640e60cdcdb1352ca0ec1fda2b94 (patch) | |
tree | e5f8e3a068b3914fc0b70966abc25fd4b0df0550 /include/linux | |
parent | b5cc76ffd6a95b4281580c7bc0dbfca70c23369e (diff) |
pci: Update pci_set_vga_state() to call arch functions
commit 95a8b6efc5d07103583f706c8a5889437d537939 upstream.
Update pci_set_vga_state to call arch dependent functions to enable Legacy
VGA I/O transactions to be redirected to correct target.
[akpm@linux-foundation.org: make pci_register_set_vga_state() __init]
Signed-off-by: Mike Travis <travis@sgi.com>
LKML-Reference: <201002022238.o12McE1J018723@imap1.linux-foundation.org>
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>
Cc: maximilian attems <max@stro.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index c1968f464c38..0afb5272d859 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -959,6 +959,11 @@ static inline int pci_proc_domain(struct pci_bus *bus) | |||
959 | } | 959 | } |
960 | #endif /* CONFIG_PCI_DOMAINS */ | 960 | #endif /* CONFIG_PCI_DOMAINS */ |
961 | 961 | ||
962 | /* some architectures require additional setup to direct VGA traffic */ | ||
963 | typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode, | ||
964 | unsigned int command_bits, bool change_bridge); | ||
965 | extern void pci_register_set_vga_state(arch_set_vga_state_t func); | ||
966 | |||
962 | #else /* CONFIG_PCI is not enabled */ | 967 | #else /* CONFIG_PCI is not enabled */ |
963 | 968 | ||
964 | /* | 969 | /* |