- Bump FreeBSD version for the hostb(4) and vgapci(4) drivers as well as

  the addition of pci_find_extcap().
- Change the drm drivers to attach to vgapci.  This is #ifdef'd so the
  code can be shared across branches.
- Use pci_find_extcap() to look for AGP and PCIE capabilities in drm.
- GC all the drmsub stuff for i810/i830/i915.  The agp and drm devices are
  now both children of vgapci.

1 files changed, 4 insertions, 36 deletions

diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 25717ce..1aa187b 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -178,7 +178,8 @@ agp_i810_find_bridge(device_t dev)
 		devid -= 0x20000;
 		break;
 	};
-	if (device_get_children(device_get_parent(dev), &children, &nchildren))
+	if (device_get_children(device_get_parent(device_get_parent(dev)),
+	    &children, &nchildren))
 		return 0;
 
 	for (i = 0; i < nchildren; i++) {
@@ -261,7 +262,6 @@ agp_i810_probe(device_t dev)
 			return ENXIO;
 		}
 
-		device_verbose(dev);
 		device_set_desc(dev, desc);
 		return BUS_PROBE_DEFAULT;
 	}
@@ -452,11 +452,7 @@ agp_i810_attach(device_t dev)
 		gatt->ag_physical = pgtblctl & ~1;
 	}
 
-	/* Add a device for the drm to attach to */
-	if (!device_add_child( dev, "drmsub", -1 ))
-		printf("out of memory...\n");
-
-	return bus_generic_attach(dev);
+	return 0;
 }
 
 static int
@@ -464,7 +460,6 @@ agp_i810_detach(device_t dev)
 {
 	struct agp_i810_softc *sc = device_get_softc(dev);
 	int error;
-	device_t child;
 
 	error = agp_generic_detach(dev);
 	if (error)
@@ -498,10 +493,6 @@ agp_i810_detach(device_t dev)
 				     sc->regs);
 	}
 
-	child = device_find_child( dev, "drmsub", 0 );
-	if (child)
-	   device_delete_child( dev, child );
-
 	return 0;
 }
 
@@ -806,26 +797,11 @@ agp_i810_unbind_memory(device_t dev, struct agp_memory *mem)
 	return 0;
 }
 
-static int
-agp_i810_print_child(device_t dev, device_t child)
-{
-	int retval = 0;
-
-	retval += bus_print_child_header(dev, child);
-	retval += printf(": (child of agp_i810.c)");
-	retval += bus_print_child_footer(dev, child);
-
-	return retval;
-}
-
 static device_method_t agp_i810_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		agp_i810_probe),
 	DEVMETHOD(device_attach,	agp_i810_attach),
 	DEVMETHOD(device_detach,	agp_i810_detach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* AGP interface */
 	DEVMETHOD(agp_get_aperture,	agp_i810_get_aperture),
@@ -839,14 +815,6 @@ static device_method_t agp_i810_methods[] = {
 	DEVMETHOD(agp_bind_memory,	agp_i810_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_i810_unbind_memory),
 
-	/* bus methods */
-	DEVMETHOD(bus_print_child,	agp_i810_print_child),
-	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
-	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
-	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
-	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 	{ 0, 0 }
 };
 
@@ -858,6 +826,6 @@ static driver_t agp_i810_driver = {
 
 static devclass_t agp_devclass;
 
-DRIVER_MODULE(agp_i810, pci, agp_i810_driver, agp_devclass, 0, 0);
+DRIVER_MODULE(agp_i810, vgapci, agp_i810_driver, agp_devclass, 0, 0);
 MODULE_DEPEND(agp_i810, agp, 1, 1, 1);
 MODULE_DEPEND(agp_i810, pci, 1, 1, 1);