- 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, 8 insertions, 0 deletions

diff --git a/sys/dev/drm/i915_drv.c b/sys/dev/drm/i915_drv.c
index f2ab394..138af37 100644
--- a/sys/dev/drm/i915_drv.c
+++ b/sys/dev/drm/i915_drv.c
@@ -98,13 +98,21 @@ static device_method_t i915_methods[] = {
 };
 
 static driver_t i915_driver = {
+#if __FreeBSD_version >= 700010
+	"drm",
+#else
 	"drmsub",
+#endif
 	i915_methods,
 	sizeof(drm_device_t)
 };
 
 extern devclass_t drm_devclass;
+#if __FreeBSD_version >= 700010
+DRIVER_MODULE(i915, vgapci, i915_driver, drm_devclass, 0, 0);
+#else
 DRIVER_MODULE(i915, agp, i915_driver, drm_devclass, 0, 0);
+#endif
 MODULE_DEPEND(i915, drm, 1, 1, 1);
 
 #elif defined(__NetBSD__) || defined(__OpenBSD__)