 @@ -1741,26 +1741,27 @@ extern int drm_sg_free(struct drm_device
 		       struct drm_file *file_priv);
 			       /* ATI PCIGART support (ati_pcigart.h) */
 extern int drm_ati_pcigart_init(struct drm_device *dev,
 				struct drm_ati_pcigart_info * gart_info);
 extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
 				   struct drm_ati_pcigart_info * gart_info);
 extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
 				       size_t align);
 extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
 extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
 #ifdef __NetBSD__
 extern int drmkms_pci_agp_guarantee_initialized(void);
 extern int drm_pci_attach(device_t, const struct pci_attach_args *,
     struct pci_dev *, struct drm_driver *, unsigned long,
     struct drm_device **);
 extern int drm_pci_detach(struct drm_device *, int);
 #endif
 			       /* sysfs support (drm_sysfs.c) */
 struct drm_sysfs_class;
 extern struct class *drm_sysfs_create(struct module *owner, char *name);
 extern void drm_sysfs_destroy(void);
 extern int drm_sysfs_device_add(struct drm_minor *minor);
 extern void drm_sysfs_hotplug_event(struct drm_device *dev);
 extern void drm_sysfs_device_remove(struct drm_minor *minor);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_pci.c,v 1.9 2015/01/01 01:15:43 mrg Exp $	*/
+/*	$NetBSD: drm_pci.c,v 1.10 2015/03/06 01:24:24 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.9 2015/01/01 01:15:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.10 2015/03/06 01:24:24 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <drm/drmP.h>
 static int	drm_pci_get_irq(struct drm_device *);
 static int	drm_pci_irq_install(struct drm_device *,
 		    irqreturn_t (*)(void *), int, const char *, void *,
 		    struct drm_bus_irq_cookie **);
 @@ -84,26 +84,32 @@ drm_pci_exit(struct drm_driver *driver _
     struct pci_driver *pdriver __unused)
+{
+}
 int
 drm_pci_attach(device_t self, const struct pci_attach_args *pa,
     struct pci_dev *pdev, struct drm_driver *driver, unsigned long cookie,
     struct drm_device **devp)
+{
 	struct drm_device *dev;
 	unsigned int unit;
 	int ret;
 	/* Ensure the drm agp hooks are installed.  */
 	/* XXX errno NetBSD->Linux */
 	ret = -drmkms_pci_agp_guarantee_initialized();
 	if (ret)
 		goto fail0;
 	/* Initialize the Linux PCI device descriptor.  */
 	linux_pci_dev_init(pdev, self, pa, 0);
 	/* Create a DRM device.  */
 	dev = drm_dev_alloc(driver, self);
 	if (dev == NULL) {
 		ret = -ENOMEM;
 		goto fail0;
+	}
 	dev->pdev = pdev;
 	/* XXX Set the power state to D0?  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_pci_module.c,v 1.3 2014/11/22 19:18:07 riastradh Exp $	*/
+/*	$NetBSD: drm_pci_module.c,v 1.4 2015/03/06 01:24:24 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,54 +20,90 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci_module.c,v 1.3 2014/11/22 19:18:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci_module.c,v 1.4 2015/03/06 01:24:24 riastradh Exp $");
 #include <sys/module.h>
 #include <sys/once.h>
 #include <drm/drmP.h>
 MODULE(MODULE_CLASS_MISC, drmkms_pci, "drmkms,pci");
 const struct drm_agp_hooks drmkms_pci_agp_hooks = {
 	.agph_acquire_ioctl = &drm_agp_acquire_ioctl,
 	.agph_release_ioctl = &drm_agp_release_ioctl,
 	.agph_enable_ioctl = &drm_agp_enable_ioctl,
 	.agph_info_ioctl = &drm_agp_info_ioctl,
 	.agph_alloc_ioctl = &drm_agp_alloc_ioctl,
 	.agph_free_ioctl = &drm_agp_free_ioctl,
 	.agph_bind_ioctl = &drm_agp_bind_ioctl,
 	.agph_unbind_ioctl = &drm_agp_unbind_ioctl,
 	.agph_release = &drm_agp_release,
 	.agph_clear = &drm_agp_clear,
 };
 static int
 drmkms_pci_agp_init(void)
+{
 	int error;
 	error = drm_agp_register(&drmkms_pci_agp_hooks);
 	if (error)
 		return error;
 	return 0;
+}
 int
 drmkms_pci_agp_guarantee_initialized(void)
+{
 #ifdef _MODULE
 	return 0;
 #else
 	static ONCE_DECL(drmkms_pci_agp_init_once);
 	return RUN_ONCE(&drmkms_pci_agp_init_once, &drmkms_pci_agp_init);
 #endif
+}
 static void
 drmkms_pci_agp_fini(void)
+{
 	drm_agp_deregister(&drmkms_pci_agp_hooks);
+}
 static int
 drmkms_pci_modcmd(modcmd_t cmd, void *arg __unused)
+{
 	int error;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
-		error = drm_agp_register(&drmkms_pci_agp_hooks);
+#ifdef _MODULE
 		error = drmkms_pci_agp_init();
 #else
 		error = drmkms_pci_agp_guarantee_initialized();
 #endif
 		if (error)
 			return error;
 		return 0;
 	case MODULE_CMD_FINI:
-		drm_agp_deregister(&drmkms_pci_agp_hooks);
+		drmkms_pci_agp_fini();
 		return 0;
 	default:
 		return ENOTTY;
+	}
+}