UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

sunxvr500: Ignore secondary output PCI devices. 

These just represent the secondary and further heads attached to the
card, and they have different sets of PCI bar registers to map.

So don't try to drive them in the main driver.

Reported-by: Frans van Berckel <fberckel@xs4all.nl>
Tested-by: Frans van Berckel <fberckel@xs4all.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2010-04-04 01:12:50 -07:00
parent 954fbc8985
commit bdd32ce95f
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/video/sunxvr500.c
View File

@ -242,11 +242,27 @@ static int __devinit e3d_set_fbinfo(struct e3d_info *ep)
static int __devinit e3d_pci_register(struct pci_dev *pdev, static int __devinit e3d_pci_register(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct device_node *of_node;
const char *device_type;
struct fb_info *info; struct fb_info *info;
struct e3d_info *ep; struct e3d_info *ep;
unsigned int line_length; unsigned int line_length;
int err; int err;
of_node = pci_device_to_OF_node(pdev);
if (!of_node) {
printk(KERN_ERR "e3d: Cannot find OF node of %s\n",
pci_name(pdev));
return -ENODEV;
}
device_type = of_get_property(of_node, "device_type", NULL);
if (!device_type) {
printk(KERN_INFO "e3d: Ignoring secondary output device "
"at %s\n", pci_name(pdev));
return -ENODEV;
}
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "e3d: Cannot enable PCI device %s\n", printk(KERN_ERR "e3d: Cannot enable PCI device %s\n",
@ -265,13 +281,7 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
ep->info = info; ep->info = info;
ep->pdev = pdev; ep->pdev = pdev;
spin_lock_init(&ep->lock); spin_lock_init(&ep->lock);
ep->of_node = pci_device_to_OF_node(pdev); ep->of_node = of_node;
if (!ep->of_node) {
printk(KERN_ERR "e3d: Cannot find OF node of %s\n",
pci_name(pdev));
err = -ENODEV;
goto err_release_fb;
}
/* Read the PCI base register of the frame buffer, which we /* Read the PCI base register of the frame buffer, which we
* need in order to interpret the RAMDAC_VID_*FB* values in * need in order to interpret the RAMDAC_VID_*FB* values in