Remove the vga-pci driver. It serves no purpose and it hides the hardware
from useful drivers such as the 3D DRI drivers I will be porting for hardware accelerated OpenGL. The hardware will still be reported during boot using the nomatch system. Approved by: jkh
This commit is contained in:
parent
96b1a65231
commit
a167c22afa
@ -1205,10 +1205,9 @@ pci_probe_nomatch(device_t dev, device_t child)
|
||||
dinfo = device_get_ivars(child);
|
||||
cfg = &dinfo->cfg;
|
||||
desc = pci_ata_match(child);
|
||||
if (!desc)
|
||||
desc = pci_usb_match(child);
|
||||
if (!desc)
|
||||
desc = "unknown card";
|
||||
if (!desc) desc = pci_usb_match(child);
|
||||
if (!desc) desc = pci_vga_match(child);
|
||||
if (!desc) desc = "unknown card";
|
||||
device_printf(dev, desc);
|
||||
printf(" (vendor=0x%04x, dev=0x%04x) at %d.%d",
|
||||
cfg->vendor,
|
||||
|
@ -152,6 +152,7 @@ extern u_int32_t pci_numdevs;
|
||||
|
||||
const char *pci_ata_match(struct device *dev);
|
||||
const char *pci_usb_match(struct device *dev);
|
||||
const char *pci_vga_match(struct device *dev);
|
||||
|
||||
/* low level PCI config register functions provided by pcibus.c */
|
||||
|
||||
|
@ -1205,10 +1205,9 @@ pci_probe_nomatch(device_t dev, device_t child)
|
||||
dinfo = device_get_ivars(child);
|
||||
cfg = &dinfo->cfg;
|
||||
desc = pci_ata_match(child);
|
||||
if (!desc)
|
||||
desc = pci_usb_match(child);
|
||||
if (!desc)
|
||||
desc = "unknown card";
|
||||
if (!desc) desc = pci_usb_match(child);
|
||||
if (!desc) desc = pci_vga_match(child);
|
||||
if (!desc) desc = "unknown card";
|
||||
device_printf(dev, desc);
|
||||
printf(" (vendor=0x%04x, dev=0x%04x) at %d.%d",
|
||||
cfg->vendor,
|
||||
|
@ -1338,7 +1338,7 @@ DRIVER_MODULE(chip, pci, chip_driver, chip_devclass, 0, 0);
|
||||
**---------------------------------------------------------
|
||||
*/
|
||||
|
||||
static const char* vga_match(device_t dev)
|
||||
const char* pci_vga_match(device_t dev)
|
||||
{
|
||||
u_int id = pci_get_devid(dev);
|
||||
const char *vendor, *chip, *type;
|
||||
@ -1819,53 +1819,6 @@ static const char* vga_match(device_t dev)
|
||||
return type;
|
||||
}
|
||||
|
||||
static int vga_probe(device_t dev)
|
||||
{
|
||||
const char *desc;
|
||||
|
||||
desc = vga_match(dev);
|
||||
if (desc) {
|
||||
device_set_desc(dev, desc);
|
||||
return -10000; /* Low match priority */
|
||||
}
|
||||
|
||||
return ENXIO;
|
||||
}
|
||||
|
||||
static int vga_attach(device_t dev)
|
||||
{
|
||||
/*
|
||||
** If the assigned addresses are remapped,
|
||||
** the console driver has to be informed about the new address.
|
||||
*/
|
||||
#if 0
|
||||
vm_offset_t va;
|
||||
vm_offset_t pa;
|
||||
int reg;
|
||||
for (reg = PCI_MAP_REG_START; reg < PCI_MAP_REG_END; reg += 4)
|
||||
(void) pci_map_mem (tag, reg, &va, &pa);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static device_method_t vga_methods[] = {
|
||||
/* Device interface */
|
||||
DEVMETHOD(device_probe, vga_probe),
|
||||
DEVMETHOD(device_attach, vga_attach),
|
||||
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
static driver_t vga_driver = {
|
||||
"vga-pci",
|
||||
vga_methods,
|
||||
1,
|
||||
};
|
||||
|
||||
static devclass_t vga_devclass;
|
||||
|
||||
DRIVER_MODULE(vga, pci, vga_driver, vga_devclass, 0, 0);
|
||||
|
||||
/*---------------------------------------------------------
|
||||
**
|
||||
** Devices to ignore
|
||||
|
@ -152,6 +152,7 @@ extern u_int32_t pci_numdevs;
|
||||
|
||||
const char *pci_ata_match(struct device *dev);
|
||||
const char *pci_usb_match(struct device *dev);
|
||||
const char *pci_vga_match(struct device *dev);
|
||||
|
||||
/* low level PCI config register functions provided by pcibus.c */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user