Rename the driver hooks in the DRM to something a little more

    understandable: preinit -> load postinit -> (removed) presetup ->
    firstopen postsetup -> (removed) open_helper -> open prerelease ->
    preclose free_filp_priv -> postclose pretakedown -> lastclose
    postcleanup -> unload release -> reclaim_buffers_locked version ->
    (removed)
postinit and version were replaced with generic code in the Linux DRM
    (drivers now set their version numbers and description in the driver
    structure, like on BSD). postsetup wasn't used at all. Fixes the savage
    hooks for initializing and tearing down mappings at the right times.
    Testing involved at least starting X, running glxgears, killing
    glxgears, exiting X, and repeating.
Tested on: FreeBSD (g200, g400, r200, r128) Linux (r200, savage4)

19 files changed, 286 insertions, 295 deletions

diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h
index 596e25f4..a42bf16b 100644
--- a/bsd-core/drmP.h
+++ b/bsd-core/drmP.h
@@ -616,25 +616,15 @@ typedef struct drm_vbl_sig {
 	int		pid;
 } drm_vbl_sig_t;
 
-/** 
- * DRM device functions structure
- */
-struct drm_device {
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-	struct device	  device; /* softc is an extension of struct device */
-#endif
-
-	/* Beginning of driver-config section */
-	int	(*preinit)(struct drm_device *, unsigned long flags);
-	int	(*postinit)(struct drm_device *, unsigned long flags);
-	void	(*prerelease)(struct drm_device *, void *filp);
-	void	(*pretakedown)(struct drm_device *);
-	int	(*postcleanup)(struct drm_device *);
-	int	(*presetup)(struct drm_device *);
-	int	(*postsetup)(struct drm_device *);
-	int	(*open_helper)(struct drm_device *, drm_file_t *);
-	void	(*free_filp_priv)(struct drm_device *, drm_file_t *);
-	void	(*release)(struct drm_device *, void *filp);
+struct drm_driver_info {
+	int	(*load)(struct drm_device *, unsigned long flags);
+	int	(*firstopen)(struct drm_device *);
+	int	(*open)(struct drm_device *, drm_file_t *);
+	void	(*preclose)(struct drm_device *, void *filp);
+	void	(*postclose)(struct drm_device *, drm_file_t *);
+	void	(*lastclose)(struct drm_device *);
+	int	(*unload)(struct drm_device *);
+	void	(*reclaim_buffers_locked)(struct drm_device *, void *filp);
 	int	(*dma_ioctl)(DRM_IOCTL_ARGS);
 	void	(*dma_ready)(struct drm_device *);
 	int	(*dma_quiescent)(struct drm_device *);
@@ -666,20 +656,19 @@ struct drm_device {
 	 * card is absolutely \b not AGP (return of 0), absolutely \b is AGP
 	 * (return of 1), or may or may not be AGP (return of 2).
 	 */
-	int (*device_is_agp) (struct drm_device * dev);
+	int	(*device_is_agp) (struct drm_device * dev);
 
+	drm_ioctl_desc_t *ioctls;
+	int	max_ioctl;
 
-	drm_ioctl_desc_t *driver_ioctls;
-	int	max_driver_ioctl;
+	int	buf_priv_size;
 
-	int	dev_priv_size;
-
-	int	driver_major;
-	int	driver_minor;
-	int	driver_patchlevel;
-	const char *driver_name;	/* Simple driver name		   */
-	const char *driver_desc;	/* Longer driver name		   */
-	const char *driver_date;	/* Date of last major changes.	   */
+	int	major;
+	int	minor;
+	int	patchlevel;
+	const char *name;		/* Simple driver name		   */
+	const char *desc;		/* Longer driver name		   */
+	const char *date;		/* Date of last major changes.	   */
 
 	unsigned use_agp :1;
 	unsigned require_agp :1;
@@ -690,7 +679,18 @@ struct drm_device {
 	unsigned use_irq :1;
 	unsigned use_vbl_irq :1;
 	unsigned use_mtrr :1;
-	/* End of driver-config section */
+};
+
+/** 
+ * DRM device functions structure
+ */
+struct drm_device {
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+	struct device	  device; /* softc is an extension of struct device */
+#endif
+
+	struct drm_driver_info driver;
+	drm_pci_id_list_t *id_entry;	/* PCI ID, name, and chipset private */
 
 	char		  *unique;	/* Unique identifier: e.g., busid  */
 	int		  unique_len;	/* Length of unique field	   */
diff --git a/bsd-core/drm_agpsupport.c b/bsd-core/drm_agpsupport.c
index 4f3a6f28..a78410a8 100644
--- a/bsd-core/drm_agpsupport.c
+++ b/bsd-core/drm_agpsupport.c
@@ -44,8 +44,8 @@ drm_device_find_capability(drm_device_t *dev, int cap)
 {
 	int ret;
 
-	if (dev->device_is_agp != NULL) {
-		ret = (*dev->device_is_agp)(dev);
+	if (dev->driver.device_is_agp != NULL) {
+		ret = (*dev->driver.device_is_agp)(dev);
 		
 		if (ret != DRM_MIGHT_BE_AGP) {
 			return ret == 2;
diff --git a/bsd-core/drm_bufs.c b/bsd-core/drm_bufs.c
index 0cc2a0d9..b00ecda2 100644
--- a/bsd-core/drm_bufs.c
+++ b/bsd-core/drm_bufs.c
@@ -402,7 +402,7 @@ static int drm_do_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
 		buf->pending = 0;
 		buf->filp    = NULL;
 
-		buf->dev_priv_size = dev->dev_priv_size;
+		buf->dev_priv_size = dev->driver.buf_priv_size;
 		buf->dev_private = malloc(buf->dev_priv_size, M_DRM,
 		    M_NOWAIT | M_ZERO);
 		if (buf->dev_private == NULL) {
@@ -543,7 +543,7 @@ static int drm_do_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
 			buf->pending = 0;
 			buf->filp    = NULL;
 
-			buf->dev_priv_size = dev->dev_priv_size;
+			buf->dev_priv_size = dev->driver.buf_priv_size;
 			buf->dev_private = malloc(buf->dev_priv_size, M_DRM,
 			    M_NOWAIT | M_ZERO);
 			if (buf->dev_private == NULL) {
@@ -657,7 +657,7 @@ static int drm_do_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
 		buf->pending = 0;
 		buf->filp    = NULL;
 
-		buf->dev_priv_size = dev->dev_priv_size;
+		buf->dev_priv_size = dev->driver.buf_priv_size;
 		buf->dev_private = malloc(buf->dev_priv_size, M_DRM,
 		    M_NOWAIT | M_ZERO);
 		if (buf->dev_private == NULL) {
@@ -988,8 +988,8 @@ int drm_mapbufs(DRM_IOCTL_ARGS)
 	if (request.count < dma->buf_count)
 		goto done;
 
-	if ((dev->use_agp && (dma->flags & _DRM_DMA_USE_AGP)) ||
-	    (dev->use_sg && (dma->flags & _DRM_DMA_USE_SG))) {
+	if ((dev->driver.use_agp && (dma->flags & _DRM_DMA_USE_AGP)) ||
+	    (dev->driver.use_sg && (dma->flags & _DRM_DMA_USE_SG))) {
 		drm_local_map_t *map = dev->agp_buffer_map;
 
 		if (map == NULL) {
diff --git a/bsd-core/drm_context.c b/bsd-core/drm_context.c
index 11e87814..11d23c6f 100644
--- a/bsd-core/drm_context.c
+++ b/bsd-core/drm_context.c
@@ -265,9 +265,9 @@ int drm_addctx(DRM_IOCTL_ARGS)
 		return DRM_ERR(ENOMEM);
 	}
 
-	if (dev->context_ctor && ctx.handle != DRM_KERNEL_CONTEXT) {
+	if (dev->driver.context_ctor && ctx.handle != DRM_KERNEL_CONTEXT) {
 		DRM_LOCK();
-		dev->context_ctor(dev, ctx.handle);
+		dev->driver.context_ctor(dev, ctx.handle);
 		DRM_UNLOCK();
 	}
 
@@ -329,9 +329,9 @@ int drm_rmctx(DRM_IOCTL_ARGS)
 
 	DRM_DEBUG( "%d\n", ctx.handle );
 	if ( ctx.handle != DRM_KERNEL_CONTEXT ) {
-		if (dev->context_dtor) {
+		if (dev->driver.context_dtor) {
 			DRM_LOCK();
-			dev->context_dtor(dev, ctx.handle);
+			dev->driver.context_dtor(dev, ctx.handle);
 			DRM_UNLOCK();
 		}
 
diff --git a/bsd-core/drm_dma.c b/bsd-core/drm_dma.c
index 6377d71e..67b3fe2d 100644
--- a/bsd-core/drm_dma.c
+++ b/bsd-core/drm_dma.c
@@ -121,8 +121,8 @@ int drm_dma(DRM_IOCTL_ARGS)
 {
 	DRM_DEVICE;
 
-	if (dev->dma_ioctl) {
-		return dev->dma_ioctl(kdev, cmd, data, flags, p, filp);
+	if (dev->driver.dma_ioctl) {
+		return dev->driver.dma_ioctl(kdev, cmd, data, flags, p, filp);
 	} else {
 		DRM_DEBUG("DMA ioctl on driver with no dma handler\n");
 		return EINVAL;
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index a12aac68..fd645163 100644
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -36,8 +36,8 @@
 
 int drm_debug_flag = 0;
 
-static int drm_init(drm_device_t *dev);
-static void drm_cleanup(drm_device_t *dev);
+static int drm_load(drm_device_t *dev);
+static void drm_unload(drm_device_t *dev);
 static drm_pci_id_list_t *drm_find_description(int vendor, int device,
     drm_pci_id_list_t *idlist);
 
@@ -186,12 +186,12 @@ int drm_attach(device_t nbdev, drm_pci_id_list_t *idlist)
 	    pci_get_device(nbdev), idlist);
 	dev->id_entry = id_entry;
 
-	return drm_init(dev);
+	return drm_load(dev);
 }
 
 int drm_detach(device_t dev)
 {
-	drm_cleanup(device_get_softc(dev));
+	drm_unload(device_get_softc(dev));
 	return 0;
 }
 
@@ -296,6 +296,7 @@ void drm_attach(struct pci_attach_args *pa, dev_t kdev,
 {
 	int i;
 	drm_device_t *dev;
+	drm_pci_id_list_t *id_entry;
 
 	config_makeroom(kdev, &drm_cd);
 	drm_cd.cd_devs[(kdev)] = malloc(sizeof(drm_device_t), M_DRM, M_WAITOK);
@@ -315,13 +316,13 @@ void drm_attach(struct pci_attach_args *pa, dev_t kdev,
 	    PCI_PRODUCT(pa->pa_id), idlist);
 	dev->driver.pci_id_entry = id_entry;
 
-	DRM_INFO("%s", drm_find_description(PCI_VENDOR(pa->pa_id), PCI_PRODUCT(pa->pa_id), idlist));
-	drm_init(dev);
+	DRM_INFO("%s", id_entry->name);
+	drm_load(dev);
 }
 
 int drm_detach(struct device *self, int flags)
 {
-	drm_cleanup((drm_device_t *)self);
+	drm_unload((drm_device_t *)self);
 	return 0;
 }
 
@@ -354,19 +355,18 @@ drm_pci_id_list_t *drm_find_description(int vendor, int device,
 	return NULL;
 }
 
-/* Initialize the DRM on first open. */
-static int drm_setup(drm_device_t *dev)
+static int drm_firstopen(drm_device_t *dev)
 {
 	int i;
 
 	DRM_SPINLOCK_ASSERT(&dev->dev_lock);
 
-	if (dev->presetup)
-		dev->presetup(dev);
+	if (dev->driver.firstopen)
+		dev->driver.firstopen(dev);
 
 	dev->buf_use = 0;
 
-	if (dev->use_dma) {
+	if (dev->driver.use_dma) {
 		i = drm_dma_setup(dev);
 		if (i != 0)
 			return i;
@@ -403,14 +403,10 @@ static int drm_setup(drm_device_t *dev)
 
 	DRM_DEBUG( "\n" );
 
-	if (dev->postsetup)
-		dev->postsetup(dev);
-
 	return 0;
 }
 
-/* Free resources associated with the DRM on the last close. */
-static int drm_takedown(drm_device_t *dev)
+static int drm_lastclose(drm_device_t *dev)
 {
 	drm_magic_entry_t *pt, *next;
 	drm_local_map_t *map, *mapsave;
@@ -420,8 +416,8 @@ static int drm_takedown(drm_device_t *dev)
 
 	DRM_DEBUG( "\n" );
 
-	if (dev->pretakedown != NULL)
-		dev->pretakedown(dev);
+	if (dev->driver.lastclose != NULL)
+		dev->driver.lastclose(dev);
 
 	if (dev->irq_enabled)
 		drm_irq_uninstall(dev);
@@ -445,8 +441,9 @@ static int drm_takedown(drm_device_t *dev)
 		drm_agp_mem_t *entry;
 		drm_agp_mem_t *nexte;
 
-				/* Remove AGP resources, but leave dev->agp
-                                   intact until drm_cleanup is called. */
+		/* Remove AGP resources, but leave dev->agp intact until
+		 * drm_unload is called.
+		 */
 		for ( entry = dev->agp->memory ; entry ; entry = nexte ) {
 			nexte = entry->next;
 			if ( entry->bound )
@@ -481,13 +478,10 @@ static int drm_takedown(drm_device_t *dev)
 	return 0;
 }
 
-/* linux: drm_init is called via init_module at module load time, or via
- *        linux/init/main.c (this is not currently supported).
- * bsd:   drm_init is called via the attach function per device.
- */
-static int drm_init(drm_device_t *dev)
+static int drm_load(drm_device_t *dev)
 {
 	int retcode;
+
 	DRM_DEBUG( "\n" );
 
 	dev->irq = pci_get_irq(dev->device);
@@ -505,16 +499,16 @@ static int drm_init(drm_device_t *dev)
 #endif
 	TAILQ_INIT(&dev->files);
 
-	if (dev->preinit != NULL) {
-		retcode = dev->preinit(dev, dev->id_entry->driver_private);
+	if (dev->driver.load != NULL) {
+		retcode = dev->driver.load(dev, dev->id_entry->driver_private);
 		if (retcode != 0)
 			goto error;
 	}
 
-	if (dev->use_agp) {
+	if (dev->driver.use_agp) {
 		if (drm_device_is_agp(dev))
 			dev->agp = drm_agp_init();
-		if (dev->require_agp && dev->agp == NULL) {
+		if (dev->driver.require_agp && dev->agp == NULL) {
 			DRM_ERROR("Card isn't AGP, or couldn't initialize "
 			    "AGP.\n");
 			retcode = DRM_ERR(ENOMEM);
@@ -534,14 +528,11 @@ static int drm_init(drm_device_t *dev)
 	}
 	
 	DRM_INFO("Initialized %s %d.%d.%d %s\n",
-	  	dev->driver_name,
-	  	dev->driver_major,
-	  	dev->driver_minor,
-	  	dev->driver_patchlevel,
-	  	dev->driver_date);
-
-	if (dev->postinit != NULL)
-		dev->postinit(dev, 0);
+	  	dev->driver.name,
+	  	dev->driver.major,
+	  	dev->driver.minor,
+	  	dev->driver.patchlevel,
+	  	dev->driver.date);
 
 	return 0;
 
@@ -550,7 +541,7 @@ error:
 	drm_sysctl_cleanup(dev);
 #endif
 	DRM_LOCK();
-	drm_takedown(dev);
+	drm_lastclose(dev);
 	DRM_UNLOCK();
 #ifdef __FreeBSD__
 	destroy_dev(dev->devnode);
@@ -561,11 +552,7 @@ error:
 	return retcode;
 }
 
-/* linux: drm_cleanup is called via cleanup_module at module unload time.
- * bsd:   drm_cleanup is called per device at module unload time.
- * FIXME: NetBSD
- */
-static void drm_cleanup(drm_device_t *dev)
+static void drm_unload(drm_device_t *dev)
 {
 	DRM_DEBUG( "\n" );
 
@@ -585,7 +572,7 @@ static void drm_cleanup(drm_device_t *dev)
 	}
 
 	DRM_LOCK();
-	drm_takedown(dev);
+	drm_lastclose(dev);
 	DRM_UNLOCK();
 
 	if ( dev->agp ) {
@@ -594,8 +581,8 @@ static void drm_cleanup(drm_device_t *dev)
 		dev->agp = NULL;
 	}
 
-	if (dev->postcleanup != NULL)
-		dev->postcleanup(dev);
+	if (dev->driver.unload != NULL)
+		dev->driver.unload(dev);
 
 	drm_mem_uninit();
 #if defined(__FreeBSD__) &&  __FreeBSD_version >= 500000
@@ -621,13 +608,13 @@ int drm_version(DRM_IOCTL_ARGS)
 			return DRM_ERR(EFAULT);				\
 	}
 
-	version.version_major = dev->driver_major;
-	version.version_minor = dev->driver_minor;
-	version.version_patchlevel = dev->driver_patchlevel;
+	version.version_major		= dev->driver.major;
+	version.version_minor		= dev->driver.minor;
+	version.version_patchlevel	= dev->driver.patchlevel;
 
-	DRM_COPY(version.name, dev->driver_name);
-	DRM_COPY(version.date, dev->driver_date);
-	DRM_COPY(version.desc, dev->driver_desc);
+	DRM_COPY(version.name, dev->driver.name);
+	DRM_COPY(version.date, dev->driver.date);
+	DRM_COPY(version.desc, dev->driver.desc);
 
 	DRM_COPY_TO_USER_IOCTL( (drm_version_t *)data, version, sizeof(version) );
 
@@ -652,7 +639,7 @@ int drm_open(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
 		device_busy(dev->device);
 #endif
 		if ( !dev->open_count++ )
-			retcode = drm_setup(dev);
+			retcode = drm_firstopen(dev);
 		DRM_UNLOCK();
 	}
 
@@ -677,8 +664,8 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
 		return EINVAL;
 	}
 
-	if (dev->prerelease != NULL)
-		dev->prerelease(dev, filp);
+	if (dev->driver.preclose != NULL)
+		dev->driver.preclose(dev, filp);
 
 	/* ========================================================
 	 * Begin inline drm_release
@@ -697,8 +684,8 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
 		DRM_DEBUG("Process %d dead, freeing lock for context %d\n",
 			  DRM_CURRENTPID,
 			  _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
-		if (dev->release != NULL)
-			dev->release(dev, filp);
+		if (dev->driver.reclaim_buffers_locked != NULL)
+			dev->driver.reclaim_buffers_locked(dev, filp);
 
 		drm_lock_free(dev, &dev->lock.hw_lock->lock,
 		    _DRM_LOCKING_CONTEXT(dev->lock.hw_lock->lock));
@@ -707,7 +694,8 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
                                    hardware at this point, possibly
                                    processed via a callback to the X
                                    server. */
-	} else if (dev->release != NULL && dev->lock.hw_lock != NULL) {
+	} else if (dev->driver.reclaim_buffers_locked != NULL &&
+	    dev->lock.hw_lock != NULL) {
 		/* The lock is required to reclaim buffers */
 		for (;;) {
 			if ( !dev->lock.hw_lock ) {
@@ -734,14 +722,14 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
 				break;
 		}
 		if (retcode == 0) {
-			dev->release(dev, filp);
+			dev->driver.reclaim_buffers_locked(dev, filp);
 			drm_lock_free(dev, &dev->lock.hw_lock->lock,
 			    DRM_KERNEL_CONTEXT);
 		}
 	}
 
-	if (dev->use_dma)
-		drm_reclaim_buffers(dev, (void *)(uintptr_t)priv->pid);
+	if (dev->driver.use_dma && !dev->driver.reclaim_buffers_locked)
+		drm_reclaim_buffers(dev, filp);
 
 #if defined (__FreeBSD__) && (__FreeBSD_version >= 500000)
 	funsetown(&dev->buf_sigio);
@@ -752,8 +740,8 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
 #endif /* __NetBSD__  || __OpenBSD__ */
 
 	if (--priv->refs == 0) {
-		if (dev->free_filp_priv != NULL)
-			dev->free_filp_priv(dev, priv);
+		if (dev->driver.postclose != NULL)
+			dev->driver.postclose(dev, priv);
 		TAILQ_REMOVE(&dev->files, priv, link);
 		free(priv, M_DRM);
 	}
@@ -767,7 +755,7 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
 	device_unbusy(dev->device);
 #endif
 	if (--dev->open_count == 0) {
-		retcode = drm_takedown(dev);
+		retcode = drm_lastclose(dev);
 	}
 
 	DRM_UNLOCK();
@@ -846,12 +834,12 @@ int drm_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int flags,
 	if (ioctl->func == NULL && nr >= DRM_COMMAND_BASE) {
 		/* The array entries begin at DRM_COMMAND_BASE ioctl nr */
 		nr -= DRM_COMMAND_BASE;
-		if (nr > dev->max_driver_ioctl) {
+		if (nr > dev->driver.max_ioctl) {
 			DRM_DEBUG("Bad driver ioctl number, 0x%x (of 0x%x)\n",
-			    nr, dev->max_driver_ioctl);
+			    nr, dev->driver.max_ioctl);
 			return EINVAL;
 		}
-		ioctl = &dev->driver_ioctls[nr];
+		ioctl = &dev->driver.ioctls[nr];
 		is_driver_ioctl = 1;
 	}
 	func = ioctl->func;
diff --git a/bsd-core/drm_fops.c b/bsd-core/drm_fops.c
index 18c08e10..b15fd056 100644
--- a/bsd-core/drm_fops.c
+++ b/bsd-core/drm_fops.c
@@ -90,8 +90,8 @@ int drm_open_helper(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p,
 		priv->ioctl_count 	= 0;
 		priv->authenticated	= !DRM_SUSER(p);
 
-		if (dev->open_helper) {
-			retcode = dev->open_helper(dev, priv);
+		if (dev->driver.open) {
+			retcode = dev->driver.open(dev, priv);
 			if (retcode != 0) {
 				free(priv, M_DRM);
 				DRM_UNLOCK();
diff --git a/bsd-core/drm_ioctl.c b/bsd-core/drm_ioctl.c
index 9079e69b..e22faa83 100644
--- a/bsd-core/drm_ioctl.c
+++ b/bsd-core/drm_ioctl.c
@@ -261,8 +261,8 @@ int drm_setversion(DRM_IOCTL_ARGS)
 
 	retv.drm_di_major = DRM_IF_MAJOR;
 	retv.drm_di_minor = DRM_IF_MINOR;
-	retv.drm_dd_major = dev->driver_major;
-	retv.drm_dd_minor = dev->driver_minor;
+	retv.drm_dd_major = dev->driver.major;
+	retv.drm_dd_minor = dev->driver.minor;
 
 	DRM_COPY_TO_USER_IOCTL((drm_set_version_t *)data, retv, sizeof(sv));
 
@@ -281,8 +281,8 @@ int drm_setversion(DRM_IOCTL_ARGS)
 	}
 
 	if (sv.drm_dd_major != -1) {
-		if (sv.drm_dd_major != dev->driver_major ||
-		    sv.drm_dd_minor < 0 || sv.drm_dd_minor > dev->driver_minor)
+		if (sv.drm_dd_major != dev->driver.major ||
+		    sv.drm_dd_minor < 0 || sv.drm_dd_minor > dev->driver.minor)
 			return EINVAL;
 	}
 	return 0;
diff --git a/bsd-core/drm_irq.c b/bsd-core/drm_irq.c
index b23ba909..5f44f918 100644
--- a/bsd-core/drm_irq.c
+++ b/bsd-core/drm_irq.c
@@ -61,7 +61,7 @@ drm_irq_handler_wrap(DRM_IRQ_ARGS)
 	drm_device_t *dev = (drm_device_t *)arg;
 
 	DRM_SPINLOCK(&dev->irq_lock);
-	dev->irq_handler(arg);
+	dev->driver.irq_handler(arg);
 	DRM_SPINUNLOCK(&dev->irq_lock);
 }
 #endif
@@ -90,7 +90,7 @@ int drm_irq_install(drm_device_t *dev)
 	DRM_SPININIT(dev->irq_lock, "DRM IRQ lock");
 
 				/* Before installing handler */
-	dev->irq_preinstall(dev);
+	dev->driver.irq_preinstall(dev);
 	DRM_UNLOCK();
 
 				/* Install handler */
@@ -126,7 +126,7 @@ int drm_irq_install(drm_device_t *dev)
 
 				/* After installing handler */
 	DRM_LOCK();
-	dev->irq_postinstall(dev);
+	dev->driver.irq_postinstall(dev);
 	DRM_UNLOCK();
 
 	return 0;
@@ -162,7 +162,7 @@ int drm_irq_uninstall(drm_device_t *dev)
 
 	DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, dev->irq );
 
-	dev->irq_uninstall(dev);
+	dev->driver.irq_uninstall(dev);
 
 #ifdef __FreeBSD__
 	DRM_UNLOCK();
@@ -190,14 +190,14 @@ int drm_control(DRM_IOCTL_ARGS)
 		/* Handle drivers whose DRM used to require IRQ setup but the
 		 * no longer does.
 		 */
-		if (!dev->use_irq)
+		if (!dev->driver.use_irq)
 			return 0;
 		if (dev->if_version < DRM_IF_VERSION(1, 2) &&
 		    ctl.irq != dev->irq)
 			return DRM_ERR(EINVAL);
 		return drm_irq_install(dev);
 	case DRM_UNINST_HANDLER:
-		if (!dev->use_irq)
+		if (!dev->driver.use_irq)
 			return 0;
 		DRM_LOCK();
 		err = drm_irq_uninstall(dev);
@@ -248,7 +248,7 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
 		ret = EINVAL;
 	} else {
 		DRM_LOCK();
-		ret = dev->vblank_wait(dev, &vblwait.request.sequence);
+		ret = dev->driver.vblank_wait(dev, &vblwait.request.sequence);
 		DRM_UNLOCK();
 
 		microtime(&now);
diff --git a/bsd-core/drm_lock.c b/bsd-core/drm_lock.c
index 1b2beaa0..d0e61d3a 100644
--- a/bsd-core/drm_lock.c
+++ b/bsd-core/drm_lock.c
@@ -112,7 +112,7 @@ int drm_lock(DRM_IOCTL_ARGS)
         DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags = 0x%08x\n",
 	    lock.context, DRM_CURRENTPID, dev->lock.hw_lock->lock, lock.flags);
 
-        if (dev->use_dma_queue && lock.context < 0)
+        if (dev->driver.use_dma_queue && lock.context < 0)
                 return EINVAL;
 
 	DRM_LOCK();
@@ -143,8 +143,9 @@ int drm_lock(DRM_IOCTL_ARGS)
 
 	/* XXX: Add signal blocking here */
 
-	if (dev->dma_quiescent != NULL && (lock.flags & _DRM_LOCK_QUIESCENT))
-		dev->dma_quiescent(dev);
+	if (dev->driver.dma_quiescent != NULL &&
+	    (lock.flags & _DRM_LOCK_QUIESCENT))
+		dev->driver.dma_quiescent(dev);
 
 	return 0;
 }
diff --git a/bsd-core/drm_sysctl.c b/bsd-core/drm_sysctl.c
index aa6bee41..b2d0cc0c 100644
--- a/bsd-core/drm_sysctl.c
+++ b/bsd-core/drm_sysctl.c
@@ -127,7 +127,7 @@ static int drm_name_info DRM_SYSCTL_HANDLER_ARGS
 	int retcode;
 	int hasunique = 0;
 
-	DRM_SYSCTL_PRINT("%s 0x%x", dev->driver_name, dev2udev(dev->devnode));
+	DRM_SYSCTL_PRINT("%s 0x%x", dev->driver.name, dev2udev(dev->devnode));
 	
 	DRM_LOCK();
 	if (dev->unique) {
diff --git a/bsd-core/i915_drv.c b/bsd-core/i915_drv.c
index e2c58c7f..d9906141 100644
--- a/bsd-core/i915_drv.c
+++ b/bsd-core/i915_drv.c
@@ -45,29 +45,29 @@ extern int i915_max_ioctl;
 
 static void i915_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = 1;	/* No dev_priv */
-	dev->prerelease = i915_driver_prerelease;
-	dev->pretakedown = i915_driver_pretakedown;
-	dev->device_is_agp = i915_driver_device_is_agp,
-	dev->irq_preinstall = i915_driver_irq_preinstall;
-	dev->irq_postinstall = i915_driver_irq_postinstall;
-	dev->irq_uninstall = i915_driver_irq_uninstall;
-	dev->irq_handler = i915_driver_irq_handler;
+	dev->buf_priv_size		= 1;	/* No dev_priv */
+	dev->preclose			= i915_driver_preclose;
+	dev->lastclose			= i915_driver_lastclose;
+	dev->device_is_agp		= i915_driver_device_is_agp,
+	dev->irq_preinstall		= i915_driver_irq_preinstall;
+	dev->irq_postinstall		= i915_driver_irq_postinstall;
+	dev->irq_uninstall		= i915_driver_irq_uninstall;
+	dev->irq_handler		= i915_driver_irq_handler;
 
-	dev->driver_ioctls = i915_ioctls;
-	dev->max_driver_ioctl = i915_max_ioctl;
+	dev->ioctls			= i915_ioctls;
+	dev->max_ioctl			= i915_max_ioctl;
 
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
+	dev->driver_name		= DRIVER_NAME;
+	dev->driver_desc		= DRIVER_DESC;
+	dev->driver_date		= DRIVER_DATE;
+	dev->driver_major		= DRIVER_MAJOR;
+	dev->driver_minor		= DRIVER_MINOR;
+	dev->driver_patchlevel		= DRIVER_PATCHLEVEL;
 
-	dev->use_agp = 1;
-	dev->require_agp = 1;
-	dev->use_mtrr = 1;
-	dev->use_irq = 1;
+	dev->use_agp			= 1;
+	dev->require_agp		= 1;
+	dev->use_mtrr			= 1;
+	dev->use_irq			= 1;
 }
 
 #ifdef __FreeBSD__
diff --git a/bsd-core/mach64_drv.c b/bsd-core/mach64_drv.c
index a1235799..e63f56e5 100644
--- a/bsd-core/mach64_drv.c
+++ b/bsd-core/mach64_drv.c
@@ -49,31 +49,31 @@ extern int mach64_max_ioctl;
 
 static void mach64_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = 1; /* No dev_priv */
-	dev->pretakedown = mach64_driver_pretakedown;
-	dev->vblank_wait = mach64_driver_vblank_wait;
-	dev->irq_preinstall = mach64_driver_irq_preinstall;
-	dev->irq_postinstall = mach64_driver_irq_postinstall;
-	dev->irq_uninstall = mach64_driver_irq_uninstall;
-	dev->irq_handler = mach64_driver_irq_handler;
-	dev->dma_ioctl = mach64_dma_buffers;
-
-	dev->driver_ioctls = mach64_ioctls;
-	dev->max_driver_ioctl = mach64_max_ioctl;
-
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
-
-	dev->use_agp = 1;
-	dev->use_mtrr = 1;
-	dev->use_pci_dma = 1;
-	dev->use_dma = 1;
-	dev->use_irq = 1;
-	dev->use_vbl_irq = 1;
+	dev->driver.buf_priv_size	= 1; /* No dev_priv */
+	dev->driver.lastclose		= mach64_driver_lastclose;
+	dev->driver.vblank_wait		= mach64_driver_vblank_wait;
+	dev->driver.irq_preinstall	= mach64_driver_irq_preinstall;
+	dev->driver.irq_postinstall	= mach64_driver_irq_postinstall;
+	dev->driver.irq_uninstall	= mach64_driver_irq_uninstall;
+	dev->driver.irq_handler		= mach64_driver_irq_handler;
+	dev->driver.dma_ioctl		= mach64_dma_buffers;
+
+	dev->driver.ioctls		= mach64_ioctls;
+	dev->driver.max_ioctl		= mach64_max_ioctl;
+
+	dev->driver.name		= DRIVER_NAME;
+	dev->driver.desc		= DRIVER_DESC;
+	dev->driver.date		= DRIVER_DATE;
+	dev->driver.major		= DRIVER_MAJOR;
+	dev->driver.minor		= DRIVER_MINOR;
+	dev->driver.patchlevel		= DRIVER_PATCHLEVEL;
+
+	dev->driver.use_agp		= 1;
+	dev->driver.use_mtrr		= 1;
+	dev->driver.use_pci_dma		= 1;
+	dev->driver.use_dma		= 1;
+	dev->driver.use_irq		= 1;
+	dev->driver.use_vbl_irq		= 1;
 }
 
 #ifdef __FreeBSD__
diff --git a/bsd-core/mga_drv.c b/bsd-core/mga_drv.c
index 04124c06..c95561a8 100644
--- a/bsd-core/mga_drv.c
+++ b/bsd-core/mga_drv.c
@@ -69,36 +69,35 @@ static int mga_driver_device_is_agp(drm_device_t * dev)
 
 static void mga_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = sizeof(drm_mga_buf_priv_t);
-	/* XXX dev->prerelease = mga_driver_prerelease; */
-	dev->preinit = mga_driver_preinit;
-	dev->postcleanup = mga_driver_postcleanup;
-	dev->vblank_wait = mga_driver_vblank_wait;
-	dev->irq_preinstall = mga_driver_irq_preinstall;
-	dev->irq_postinstall = mga_driver_irq_postinstall;
-	dev->irq_uninstall = mga_driver_irq_uninstall;
-	dev->irq_handler = mga_driver_irq_handler;
-	dev->dma_ioctl = mga_dma_buffers;
-	dev->pretakedown = mga_driver_pretakedown;
-	dev->dma_quiescent = mga_driver_dma_quiescent;
-	dev->device_is_agp = mga_driver_device_is_agp;
-
-	dev->driver_ioctls = mga_ioctls;
-	dev->max_driver_ioctl = mga_max_ioctl;
-
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
-
-	dev->use_agp = 1;
-	dev->require_agp = 1;
-	dev->use_mtrr = 1;
-	dev->use_dma = 1;
-	dev->use_irq = 1;
-	dev->use_vbl_irq = 1;
+	dev->driver.buf_priv_size	= sizeof(drm_mga_buf_priv_t);
+	dev->driver.load		= mga_driver_load;
+	dev->driver.unload		= mga_driver_unload;
+	dev->driver.lastclose		= mga_driver_lastclose;
+	dev->driver.vblank_wait		= mga_driver_vblank_wait;
+	dev->driver.irq_preinstall	= mga_driver_irq_preinstall;
+	dev->driver.irq_postinstall	= mga_driver_irq_postinstall;
+	dev->driver.irq_uninstall	= mga_driver_irq_uninstall;
+	dev->driver.irq_handler		= mga_driver_irq_handler;
+	dev->driver.dma_ioctl		= mga_dma_buffers;
+	dev->driver.dma_quiescent	= mga_driver_dma_quiescent;
+	dev->driver.device_is_agp	= mga_driver_device_is_agp;
+
+	dev->driver.ioctls		= mga_ioctls;
+	dev->driver.max_ioctl		= mga_max_ioctl;
+
+	dev->driver.name		= DRIVER_NAME;
+	dev->driver.desc		= DRIVER_DESC;
+	dev->driver.date		= DRIVER_DATE;
+	dev->driver.major		= DRIVER_MAJOR;
+	dev->driver.minor		= DRIVER_MINOR;
+	dev->driver.patchlevel		= DRIVER_PATCHLEVEL;
+
+	dev->driver.use_agp		= 1;
+	dev->driver.require_agp		= 1;
+	dev->driver.use_mtrr		= 1;
+	dev->driver.use_dma		= 1;
+	dev->driver.use_irq		= 1;
+	dev->driver.use_vbl_irq		= 1;
 }
 
 
diff --git a/bsd-core/r128_drv.c b/bsd-core/r128_drv.c
index 94f4ce79..a0e44c20 100644
--- a/bsd-core/r128_drv.c
+++ b/bsd-core/r128_drv.c
@@ -47,33 +47,33 @@ extern int r128_max_ioctl;
 
 static void r128_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = sizeof(drm_r128_buf_priv_t);
-	dev->prerelease = r128_driver_prerelease;
-	dev->pretakedown = r128_driver_pretakedown;
-	dev->vblank_wait = r128_driver_vblank_wait;
-	dev->irq_preinstall = r128_driver_irq_preinstall;
-	dev->irq_postinstall = r128_driver_irq_postinstall;
-	dev->irq_uninstall = r128_driver_irq_uninstall;
-	dev->irq_handler = r128_driver_irq_handler;
-	dev->dma_ioctl = r128_cce_buffers;
+	dev->driver.buf_priv_size	= sizeof(drm_r128_buf_priv_t);
+	dev->driver.preclose		= r128_driver_preclose;
+	dev->driver.lastclose		= r128_driver_lastclose;
+	dev->driver.vblank_wait		= r128_driver_vblank_wait;
+	dev->driver.irq_preinstall	= r128_driver_irq_preinstall;
+	dev->driver.irq_postinstall	= r128_driver_irq_postinstall;
+	dev->driver.irq_uninstall	= r128_driver_irq_uninstall;
+	dev->driver.irq_handler		= r128_driver_irq_handler;
+	dev->driver.dma_ioctl		= r128_cce_buffers;
 
-	dev->driver_ioctls = r128_ioctls;
-	dev->max_driver_ioctl = r128_max_ioctl;
+	dev->driver.ioctls		= r128_ioctls;
+	dev->driver.max_ioctl		= r128_max_ioctl;
 
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
+	dev->driver.name		= DRIVER_NAME;
+	dev->driver.desc		= DRIVER_DESC;
+	dev->driver.date		= DRIVER_DATE;
+	dev->driver.major		= DRIVER_MAJOR;
+	dev->driver.minor		= DRIVER_MINOR;
+	dev->driver.patchlevel		= DRIVER_PATCHLEVEL;
 
-	dev->use_agp = 1;
-	dev->use_mtrr = 1;
-	dev->use_pci_dma = 1;
-	dev->use_sg = 1;
-	dev->use_dma = 1;
-	dev->use_irq = 1;
-	dev->use_vbl_irq = 1;
+	dev->driver.use_agp		= 1;
+	dev->driver.use_mtrr		= 1;
+	dev->driver.use_pci_dma		= 1;
+	dev->driver.use_sg		= 1;
+	dev->driver.use_dma		= 1;
+	dev->driver.use_irq		= 1;
+	dev->driver.use_vbl_irq		= 1;
 }
 
 #ifdef __FreeBSD__
diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c
index 78079b72..bd59db63 100644
--- a/bsd-core/radeon_drv.c
+++ b/bsd-core/radeon_drv.c
@@ -45,37 +45,38 @@ extern int radeon_max_ioctl;
 
 static void radeon_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = sizeof(drm_radeon_buf_priv_t);
-	dev->preinit = radeon_preinit;
-	dev->postcleanup = radeon_postcleanup;
-	dev->prerelease = radeon_driver_prerelease;
-	dev->pretakedown = radeon_driver_pretakedown;
-	dev->open_helper = radeon_driver_open_helper;
-	dev->free_filp_priv = radeon_driver_free_filp_priv;
-	dev->vblank_wait = radeon_driver_vblank_wait;
-	dev->irq_preinstall = radeon_driver_irq_preinstall;
-	dev->irq_postinstall = radeon_driver_irq_postinstall;
-	dev->irq_uninstall = radeon_driver_irq_uninstall;
-	dev->irq_handler = radeon_driver_irq_handler;
-	dev->dma_ioctl = radeon_cp_buffers;
+	dev->driver.buf_priv_size	= sizeof(drm_radeon_buf_priv_t);
+	dev->driver.load		= radeon_driver_load;
+	dev->driver.unload		= radeon_driver_unload;
+	dev->driver.firstopen		= radeon_driver_firstopen;
+	dev->driver.open		= radeon_driver_open;
+	dev->driver.preclose		= radeon_driver_preclose;
+	dev->driver.postclose		= radeon_driver_postclose;
+	dev->driver.lastclose		= radeon_driver_lastclose;
+	dev->driver.vblank_wait		= radeon_driver_vblank_wait;
+	dev->driver.irq_preinstall	= radeon_driver_irq_preinstall;
+	dev->driver.irq_postinstall	= radeon_driver_irq_postinstall;
+	dev->driver.irq_uninstall	= radeon_driver_irq_uninstall;
+	dev->driver.irq_handler		= radeon_driver_irq_handler;
+	dev->driver.dma_ioctl		= radeon_cp_buffers;
 
-	dev->driver_ioctls = radeon_ioctls;
-	dev->max_driver_ioctl = radeon_max_ioctl;
+	dev->driver.ioctls		= radeon_ioctls;
+	dev->driver.max_ioctl		= radeon_max_ioctl;
 
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
+	dev->driver.name		= DRIVER_NAME;
+	dev->driver.desc		= DRIVER_DESC;
+	dev->driver.date		= DRIVER_DATE;
+	dev->driver.major		= DRIVER_MAJOR;
+	dev->driver.minor		= DRIVER_MINOR;
+	dev->driver.patchlevel		= DRIVER_PATCHLEVEL;
 
-	dev->use_agp = 1;
-	dev->use_mtrr = 1;
-	dev->use_pci_dma = 1;
-	dev->use_sg = 1;
-	dev->use_dma = 1;
-	dev->use_irq = 1;
-	dev->use_vbl_irq = 1;
+	dev->driver.use_agp		= 1;
+	dev->driver.use_mtrr		= 1;
+	dev->driver.use_pci_dma		= 1;
+	dev->driver.use_sg		= 1;
+	dev->driver.use_dma		= 1;
+	dev->driver.use_irq		= 1;
+	dev->driver.use_vbl_irq		= 1;
 }
 
 #ifdef __FreeBSD__
diff --git a/bsd-core/savage_drv.c b/bsd-core/savage_drv.c
index a75a69ff..c9a2fb10 100644
--- a/bsd-core/savage_drv.c
+++ b/bsd-core/savage_drv.c
@@ -42,26 +42,28 @@ extern int savage_max_ioctl;
 
 static void savage_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = sizeof(drm_savage_buf_priv_t);
-	dev->preinit = savage_preinit;
-	dev->postcleanup = savage_postcleanup;
-	dev->reclaim_buffers = savage_reclaim_buffers;
-	dev->dma_ioctl = savage_bci_buffers;
+	dev->driver.buf_priv_size	= sizeof(drm_savage_buf_priv_t);
+	dev->load			= savage_driver_load;
+	dev->firstopen			= savage_driver_firstopen;
+	dev->lastclose			= savage_driver_lastclose;
+	dev->unload			= savage_driver_unload;
+	dev->reclaim_buffers		= savage_reclaim_buffers;
+	dev->dma_ioctl			= savage_bci_buffers;
 
-	dev->driver_ioctls = savage_ioctls;
-	dev->max_driver_ioctl = savage_max_ioctl;
+	dev->ioctls			= savage_ioctls;
+	dev->max_ioctl			= savage_max_ioctl;
 
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
+	dev->driver.name		= DRIVER_NAME;
+	dev->driver.desc		= DRIVER_DESC;
+	dev->driver.date		= DRIVER_DATE;
+	dev->driver.major		= DRIVER_MAJOR;
+	dev->driver.minor		= DRIVER_MINOR;
+	dev->driver.patchlevel		= DRIVER_PATCHLEVEL;
 
-	dev->use_agp = 1;
-	dev->use_mtrr = 1;
-	dev->use_pci_dma = 1;
-	dev->use_dma = 1;
+	dev->use_agp			= 1;
+	dev->use_mtrr			= 1;
+	dev->use_pci_dma		= 1;
+	dev->use_dma			= 1;
 }
 
 #ifdef __FreeBSD__
diff --git a/bsd-core/sis_drv.c b/bsd-core/sis_drv.c
index 6aa25937..342c7385 100644
--- a/bsd-core/sis_drv.c
+++ b/bsd-core/sis_drv.c
@@ -41,22 +41,22 @@ extern int sis_max_ioctl;
 
 static void sis_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = 1; /* No dev_priv */
-	dev->context_ctor = sis_init_context;
-	dev->context_dtor = sis_final_context;
+	dev->driver.buf_priv_size	= 1; /* No dev_priv */
+	dev->driver.context_ctor	= sis_init_context;
+	dev->driver.context_dtor	= sis_final_context;
 
-	dev->driver_ioctls = sis_ioctls;
-	dev->max_driver_ioctl = sis_max_ioctl;
+	dev->driver.ioctls		= sis_ioctls;
+	dev->driver.max_ioctl		= sis_max_ioctl;
 
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
+	dev->driver.name		= DRIVER_NAME;
+	dev->driver.desc		= DRIVER_DESC;
+	dev->driver.date		= DRIVER_DATE;
+	dev->driver.major		= DRIVER_MAJOR;
+	dev->driver.minor		= DRIVER_MINOR;
+	dev->driver.patchlevel		= DRIVER_PATCHLEVEL;
 
-	dev->use_agp = 1;
-	dev->use_mtrr = 1;
+	dev->driver.use_agp		= 1;
+	dev->driver.use_mtrr		= 1;
 }
 
 #ifdef __FreeBSD__
diff --git a/bsd-core/tdfx_drv.c b/bsd-core/tdfx_drv.c
index 98ae9ae5..40a552b9 100644
--- a/bsd-core/tdfx_drv.c
+++ b/bsd-core/tdfx_drv.c
@@ -46,18 +46,18 @@ extern int tdfx_max_ioctl;
 
 static void tdfx_configure(drm_device_t *dev)
 {
-	dev->dev_priv_size = 1; /* No dev_priv */
+	dev->driver.buf_priv_size	= 1; /* No dev_priv */
 
-	dev->max_driver_ioctl = 0;
+	dev->driver.max_ioctl		= 0;
 
-	dev->driver_name = DRIVER_NAME;
-	dev->driver_desc = DRIVER_DESC;
-	dev->driver_date = DRIVER_DATE;
-	dev->driver_major = DRIVER_MAJOR;
-	dev->driver_minor = DRIVER_MINOR;
-	dev->driver_patchlevel = DRIVER_PATCHLEVEL;
+	dev->driver.name		= DRIVER_NAME;
+	dev->driver.desc		= DRIVER_DESC;
+	dev->driver.date		= DRIVER_DATE;
+	dev->driver.major		= DRIVER_MAJOR;
+	dev->driver.minor		= DRIVER_MINOR;
+	dev->driver.patchlevel		= DRIVER_PATCHLEVEL;
 
-	dev->use_mtrr = 1;
+	dev->driver.use_mtrr		= 1;
 }
 
 #ifdef __FreeBSD__