Commit 04568c0a authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[AGPGART] Delete confusing message when not using onboard i815 gfx.

If you use an external graphic card, the secondary device disappears,
which makes agpgart spew a message like

Detected an Intel i815 Chipset, but could not find the secondary device.

Which is ok, as we don't want to use it anyway.
This is confusing to users, as I've even had some people saying they
thought it was a hardware fault.
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 6e88ed1c
...@@ -1489,18 +1489,13 @@ static struct agp_bridge_driver intel_7505_driver = { ...@@ -1489,18 +1489,13 @@ static struct agp_bridge_driver intel_7505_driver = {
.agp_destroy_page = agp_generic_destroy_page, .agp_destroy_page = agp_generic_destroy_page,
}; };
static int find_i810(u16 device, const char *name) static int find_i810(u16 device)
{ {
struct pci_dev *i810_dev; struct pci_dev *i810_dev;
i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL, device, NULL); i810_dev = pci_find_device(PCI_VENDOR_ID_INTEL, device, NULL);
if (!i810_dev) { if (!i810_dev)
printk(KERN_ERR PFX "Detected an Intel %s Chipset, "
"but could not find the secondary device.\n",
name);
return 0; return 0;
}
intel_i810_private.i810_dev = i810_dev; intel_i810_private.i810_dev = i810_dev;
return 1; return 1;
} }
...@@ -1550,29 +1545,29 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, ...@@ -1550,29 +1545,29 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
name = "440GX"; name = "440GX";
break; break;
case PCI_DEVICE_ID_INTEL_82810_MC1: case PCI_DEVICE_ID_INTEL_82810_MC1:
if (!find_i810(PCI_DEVICE_ID_INTEL_82810_IG1, "i810")) name = "i810";
if (!find_i810(PCI_DEVICE_ID_INTEL_82810_IG1))
goto fail; goto fail;
bridge->driver = &intel_810_driver; bridge->driver = &intel_810_driver;
name = "i810";
break; break;
case PCI_DEVICE_ID_INTEL_82810_MC3: case PCI_DEVICE_ID_INTEL_82810_MC3:
if (!find_i810(PCI_DEVICE_ID_INTEL_82810_IG3, "i810 DC100")) name = "i810 DC100";
if (!find_i810(PCI_DEVICE_ID_INTEL_82810_IG3))
goto fail; goto fail;
bridge->driver = &intel_810_driver; bridge->driver = &intel_810_driver;
name = "i810 DC100";
break; break;
case PCI_DEVICE_ID_INTEL_82810E_MC: case PCI_DEVICE_ID_INTEL_82810E_MC:
if (!find_i810(PCI_DEVICE_ID_INTEL_82810E_IG, "i810 E")) name = "i810 E";
if (!find_i810(PCI_DEVICE_ID_INTEL_82810E_IG))
goto fail; goto fail;
bridge->driver = &intel_810_driver; bridge->driver = &intel_810_driver;
name = "i810 E";
break; break;
case PCI_DEVICE_ID_INTEL_82815_MC: case PCI_DEVICE_ID_INTEL_82815_MC:
/* /*
* The i815 can operate either as an i810 style * The i815 can operate either as an i810 style
* integrated device, or as an AGP4X motherboard. * integrated device, or as an AGP4X motherboard.
*/ */
if (find_i810(PCI_DEVICE_ID_INTEL_82815_CGC, "i815")) if (find_i810(PCI_DEVICE_ID_INTEL_82815_CGC))
bridge->driver = &intel_810_driver; bridge->driver = &intel_810_driver;
else else
bridge->driver = &intel_815_driver; bridge->driver = &intel_815_driver;
...@@ -1708,7 +1703,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, ...@@ -1708,7 +1703,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, bridge); pci_set_drvdata(pdev, bridge);
return agp_add_bridge(bridge); return agp_add_bridge(bridge);
fail:
fail:
printk(KERN_ERR PFX "Detected an Intel %s chipset, "
"but could not find the secondary device.\n", name);
agp_put_bridge(bridge); agp_put_bridge(bridge);
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment