summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2012-04-16 22:26:05 +0200
committerDave Airlie <airlied@redhat.com>2012-04-24 10:50:18 +0200
commitb4aa0163056b6c70029b6e8619ce07c274351f42 (patch)
tree4cb41bfde5026aeff49656fb07acdf77c9f1fc31 /arch
parentx86: Use vga_default_device() when determining whether an fb is primary (diff)
downloadlinux-b4aa0163056b6c70029b6e8619ce07c274351f42.tar.xz
linux-b4aa0163056b6c70029b6e8619ce07c274351f42.zip
efifb: Implement vga_default_device() (v2)
EFI doesn't typically make use of the legacy VGA ROM, but it may still be configured to pass that through to a given video device. This may lead to an inaccurate choice of default video device. Add support to efifb to pick out the correct active video device. v2: fix if->ifdef Signed-off-by: Matthew Garrett <mjg@redhat.com> Acked-by: hpa@zytor.com Cc: matt.fleming@intel.com Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/vga.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vga.h b/arch/x86/include/asm/vga.h
index c4b9dc2f67c5..44282fbf7bf9 100644
--- a/arch/x86/include/asm/vga.h
+++ b/arch/x86/include/asm/vga.h
@@ -17,4 +17,10 @@
#define vga_readb(x) (*(x))
#define vga_writeb(x, y) (*(y) = (x))
+#ifdef CONFIG_FB_EFI
+#define __ARCH_HAS_VGA_DEFAULT_DEVICE
+extern struct pci_dev *vga_default_device(void);
+extern void vga_set_default_device(struct pci_dev *pdev);
+#endif
+
#endif /* _ASM_X86_VGA_H */