Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: Use vga_default_device() when determining whether an fb is primary

Browse source 
IORESOURCE_ROM_SHADOW is not necessarily an indication that the hardware
is the primary device. Add support for using the vgaarb functions and
fall back if nothing's set them.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: mingo@redhat.com
Acked-by: hpa@zytor.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Matthew Garrett 2012-04-16 16:26:04 -04:00 committed by Dave Airlie
parent 2fbe8c7c3e
commit 88674088d1
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/x86/video/fbdev.c
View file

@ -9,24 +9,34 @@
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/vgaarb.h>
int fb_is_primary_device(struct fb_info *info) int fb_is_primary_device(struct fb_info *info)
{ {
struct device *device = info->device; struct device *device = info->device;
struct pci_dev *pci_dev = NULL; struct pci_dev *pci_dev = NULL;
struct pci_dev *default_device = vga_default_device();
struct resource *res = NULL; struct resource *res = NULL;
int retval = 0;
if (device) if (device)
pci_dev = to_pci_dev(device); pci_dev = to_pci_dev(device);
if (pci_dev) if (!pci_dev)
res = &pci_dev->resource[PCI_ROM_RESOURCE]; return 0;
if (default_device) {
if (pci_dev == default_device)
return 1;
else
return 0;
}
res = &pci_dev->resource[PCI_ROM_RESOURCE];
if (res && res->flags & IORESOURCE_ROM_SHADOW) if (res && res->flags & IORESOURCE_ROM_SHADOW)
retval = 1; return 1;
return retval; return 0;
} }
EXPORT_SYMBOL(fb_is_primary_device); EXPORT_SYMBOL(fb_is_primary_device);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");