diff options
author | Matthew Garrett <mjg@redhat.com> | 2012-04-16 16:26:02 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-04-24 09:50:15 +0100 |
commit | 1a39b310e920bb7098067d96411b31e459ae8f32 (patch) | |
tree | 90f45eed83bcd5308ac9ad850844d0b57038e5f8 /include/linux/vgaarb.h | |
parent | f122c6109b1a79153cfb1e188c665ce3f312a886 (diff) | |
download | linux-stable-1a39b310e920bb7098067d96411b31e459ae8f32.tar.gz linux-stable-1a39b310e920bb7098067d96411b31e459ae8f32.tar.bz2 linux-stable-1a39b310e920bb7098067d96411b31e459ae8f32.zip |
vgaarb: Add support for setting the default video device (v2)
The default VGA device is a somewhat fluid concept on platforms with
multiple GPUs. Add support for setting it so switching code can update
things appropriately, and make sure that the sysfs code returns the right
device if it's changed.
v2: Updated to fix builds when __ARCH_HAS_VGA_DEFAULT_DEVICE is false.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Acked-by: benh@kernel.crashing.org
Cc: airlied@redhat.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux/vgaarb.h')
-rw-r--r-- | include/linux/vgaarb.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index 9c3120dca294..759a25ba0539 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h @@ -31,6 +31,7 @@ #ifndef LINUX_VGA_H #define LINUX_VGA_H +#include <video/vga.h> /* Legacy VGA regions */ #define VGA_RSRC_NONE 0x00 @@ -181,6 +182,7 @@ extern void vga_put(struct pci_dev *pdev, unsigned int rsrc); #ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE extern struct pci_dev *vga_default_device(void); +extern void vga_set_default_device(struct pci_dev *pdev); #endif /** |