 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_agpsupport.c,v 1.12 2021/12/18 23:44:57 riastradh Exp $	*/
+/*	$NetBSD: drm_agpsupport.c,v 1.13 2022/07/19 22:24:33 riastradh Exp $	*/
 /*
  * \file drm_agpsupport.c
  * DRM support for AGP/GART backend
+ *
  * \author Rickard E. (Rik) Faith <faith@valinux.com>
  * \author Gareth Hughes <gareth@valinux.com>
  */
 /*
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
 @@ -24,27 +24,27 @@
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_agpsupport.c,v 1.12 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agpsupport.c,v 1.13 2022/07/19 22:24:33 riastradh Exp $");
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <asm/agp.h>
 #include <drm/drm_agpsupport.h>
 #include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <drm/drm_print.h>
 @@ -517,44 +517,28 @@ static void drm_agp_clear_hook(struct dr
 			drm_unbind_agp(entry->memory);
 		drm_free_agp(entry->memory, entry->pages);
 #endif
 		kfree(entry);
+	}
 	INIT_LIST_HEAD(&dev->agp->memory);
 	if (dev->agp->acquired)
 		drm_agp_release(dev);
 	dev->agp->acquired = 0;
 	dev->agp->enabled = 0;
+}
 #ifdef __NetBSD__
 static void __pci_iomem *
 drm_agp_borrow_hook(struct drm_device *dev, unsigned i, bus_size_t size)
 	struct pci_dev *pdev = dev->pdev;
-	if (!agp_i810_borrow(pdev->pd_resources[i].addr, size,
+#ifdef __NetBSD__
 		&pdev->pd_resources[i].bsh))
 		return NULL;
 	/* XXX Synchronize with pci_iomap in linux_pci.c.  */
 	pdev->pd_resources[i].bst = pdev->pd_pa.pa_memt;
 	pdev->pd_resources[i].kva = bus_space_vaddr(pdev->pd_resources[i].bst,
 	    pdev->pd_resources[i].bsh);
 	pdev->pd_resources[i].mapped = true;
 	return pdev->pd_resources[i].kva;
 static void
 drm_agp_flush_hook(void)
+{
 	agp_flush_cache();
+}
 static const struct drm_agp_hooks agp_hooks = {
 	.agph_info = drm_agp_info_hook,
 	.agph_info_ioctl = drm_agp_info_ioctl_hook,
 	.agph_acquire = drm_agp_acquire_hook,
 	.agph_acquire_ioctl = drm_agp_acquire_ioctl_hook,
 @@ -562,27 +546,26 @@ static const struct drm_agp_hooks agp_ho
 	.agph_release_ioctl = drm_agp_release_ioctl_hook,
 	.agph_enable = drm_agp_enable_hook,
 	.agph_enable_ioctl = drm_agp_enable_ioctl_hook,
 	.agph_alloc = drm_agp_alloc_hook,
 	.agph_alloc_ioctl = drm_agp_alloc_ioctl_hook,
 	.agph_unbind = drm_agp_unbind_hook,
 	.agph_unbind_ioctl = drm_agp_unbind_ioctl_hook,
 	.agph_bind = drm_agp_bind_hook,
 	.agph_bind_ioctl = drm_agp_bind_ioctl_hook,
 	.agph_free = drm_agp_free_hook,
 	.agph_free_ioctl = drm_agp_free_ioctl_hook,
 	.agph_init = drm_agp_init_hook,
 	.agph_clear = drm_agp_clear_hook,
 	.agph_borrow = drm_agp_borrow_hook,
 	.agph_flush = drm_agp_flush_hook,
 };
 #include <sys/module.h>
 #include <sys/once.h>
 MODULE(MODULE_CLASS_MISC, drmkms_agp, "drmkms"); /* XXX agp */
 static int
 drmkms_agp_init(void)
+{
 	return drm_agp_register(&agp_hooks);
 @@ -612,24 +595,26 @@ drmkms_agp_modcmd(modcmd_t cmd, void *ar
+{
 	int error;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 #ifdef _MODULE
 		error = drmkms_agp_init();
 #else
 		error = drmkms_agp_guarantee_initialized();
 #endif
 		if (error)
 			return error;
 		return 0;
 	case MODULE_CMD_AUTOUNLOAD:
 		return EBUSY;
 	case MODULE_CMD_FINI:
 		error = drmkms_agp_fini();
 		if (error)
 			return error;
 		return 0;
 	default:
 		return ENOTTY;
+	}
+}
 #endif	/* __NetBSD__ */

 @@ -1,37 +1,35 @@
-/*	$NetBSD: drm_agpsupport.h,v 1.9 2021/12/18 23:45:45 riastradh Exp $	*/
+/*	$NetBSD: drm_agpsupport.h,v 1.10 2022/07/19 22:24:34 riastradh Exp $	*/
 /* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DRM_AGPSUPPORT_H_
 #define _DRM_AGPSUPPORT_H_
 #include <linux/agp_backend.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mm.h>
 #include <linux/mutex.h>
 #include <linux/types.h>
 #include <uapi/drm/drm.h>
 #ifdef __NetBSD__
 #include <drm/drm_agp_netbsd.h>
 #endif
 struct drm_device;
 struct drm_file;
 struct drm_agp_hooks {
 	void __pci_iomem *
 		(*agph_borrow)(struct drm_device *, unsigned, bus_size_t);
 	void	(*agph_flush)(void);
 	struct drm_agp_head *
 		(*agph_init)(struct drm_device *);
 	void	(*agph_clear)(struct drm_device *);
 	int	(*agph_acquire)(struct drm_device *);
 	int	(*agph_release)(struct drm_device *);
 	int	(*agph_enable)(struct drm_device *, struct drm_agp_mode);
 	int	(*agph_info)(struct drm_device *, struct drm_agp_info *);
 	int	(*agph_alloc)(struct drm_device *, struct drm_agp_buffer *);
 	int	(*agph_free)(struct drm_device *, struct drm_agp_buffer *);
 	int	(*agph_bind)(struct drm_device *, struct drm_agp_binding *);
 	int	(*agph_unbind)(struct drm_device *, struct drm_agp_binding *);
 @@ -98,27 +96,26 @@ int drm_agp_alloc(struct drm_device *dev
 int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);
 int drm_agp_free_ioctl(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);
 int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
 			 struct drm_file *file_priv);
 int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
 int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
 #ifdef __NetBSD__
 void __pci_iomem *drm_agp_borrow(struct drm_device *, unsigned, bus_size_t);
 void drm_agp_flush(void);
 void drm_agp_fini(struct drm_device *);
 int drm_agp_register(const struct drm_agp_hooks *);
 int drm_agp_deregister(const struct drm_agp_hooks *);
 void drm_agp_hooks_init(void);
 void drm_agp_hooks_fini(void);
 int drmkms_agp_guarantee_initialized(void);
 #endif
 #else /* CONFIG_AGP */
 #if !defined(__NetBSD__)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_agp_hook.c,v 1.6 2021/12/19 09:52:00 riastradh Exp $	*/
+/*	$NetBSD: drm_agp_hook.c,v 1.7 2022/07/19 22:24:34 riastradh Exp $	*/
 /*-
  * Copyright (c) 2018 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_agp_hook.c,v 1.6 2021/12/19 09:52:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.7 2022/07/19 22:24:34 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/condvar.h>
 #include <sys/errno.h>
 #include <sys/mutex.h>
 #include <sys/once.h>
 #include <drm/drm_agpsupport.h>
 #include <drm/drm_drv.h>
 #include "../dist/drm/drm_internal.h"
 static struct {
 	kmutex_t			lock;
 @@ -254,37 +254,23 @@ NAME(struct drm_device *dev, void *data,
 		return -ENODEV;						      \
 	return dev->agp->hooks->FIELD(dev, data, file);			      \
+}
 DEFINE_AGP_HOOK_IOCTL(drm_agp_acquire_ioctl, agph_acquire_ioctl)
 DEFINE_AGP_HOOK_IOCTL(drm_agp_release_ioctl, agph_release_ioctl)
 DEFINE_AGP_HOOK_IOCTL(drm_agp_enable_ioctl, agph_enable_ioctl)
 DEFINE_AGP_HOOK_IOCTL(drm_agp_info_ioctl, agph_info_ioctl)
 DEFINE_AGP_HOOK_IOCTL(drm_agp_alloc_ioctl, agph_alloc_ioctl)
 DEFINE_AGP_HOOK_IOCTL(drm_agp_free_ioctl, agph_free_ioctl)
 DEFINE_AGP_HOOK_IOCTL(drm_agp_bind_ioctl, agph_bind_ioctl)
 DEFINE_AGP_HOOK_IOCTL(drm_agp_unbind_ioctl, agph_unbind_ioctl)
 void __pci_iomem *
 drm_agp_borrow(struct drm_device *dev, unsigned bar, bus_size_t size)
 	const struct drm_agp_hooks *hooks;
 	void __pci_iomem *iomem;
 	if ((hooks = drm_agp_hooks_acquire()) == NULL)
 		return NULL;
 	iomem = hooks->agph_borrow(dev, bar, size);
 	drm_agp_hooks_release(hooks);
 	return iomem;
 void
 drm_agp_flush(void)
+{
 	const struct drm_agp_hooks *hooks;
 	if ((hooks = drm_agp_hooks_acquire()) == NULL)
 		return;
 	hooks->agph_flush();
 	drm_agp_hooks_release(hooks);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_pci.c,v 1.21 2022/02/27 14:19:20 riastradh Exp $	*/
+/*	$NetBSD: linux_pci.c,v 1.22 2022/07/19 22:24:34 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.
 @@ -25,27 +25,27 @@
  * 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.
  */
 #ifdef _KERNEL_OPT
 #include "acpica.h"
 #include "opt_pci.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.21 2022/02/27 14:19:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_pci.c,v 1.22 2022/07/19 22:24:34 riastradh Exp $");
 #if NACPICA > 0
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_pci.h>
 #endif
 #include <linux/pci.h>
 #include <drm/drm_agp_netbsd.h>
 device_t
 pci_dev_dev(struct pci_dev *pdev)
+{
 @@ -629,27 +629,26 @@ pci_iomap(struct pci_dev *pdev, unsigned
 	KASSERT(i < PCI_NUM_RESOURCES);
 	KASSERT(pdev->pd_resources[i].kva == NULL);
 	if (PCI_MAPREG_TYPE(pdev->pd_resources[i].type) != PCI_MAPREG_TYPE_MEM)
 		return NULL;
 	if (pdev->pd_resources[i].size < size)
 		return NULL;
 	error = bus_space_map(pdev->pd_pa.pa_memt, pdev->pd_resources[i].addr,
 	    size, BUS_SPACE_MAP_LINEAR | pdev->pd_resources[i].flags,
 	    &pdev->pd_resources[i].bsh);
 	if (error)
 		return NULL;
 	/* XXX Synchronize with drm_agp_borrow_hook in drm_agpsupport.c.  */
 	pdev->pd_resources[i].bst = pdev->pd_pa.pa_memt;
 	pdev->pd_resources[i].kva = bus_space_vaddr(pdev->pd_resources[i].bst,
 	    pdev->pd_resources[i].bsh);
 	pdev->pd_resources[i].mapped = true;
 	return pdev->pd_resources[i].kva;
+}
 void
 pci_iounmap(struct pci_dev *pdev, void __pci_iomem *kva)
+{
 	unsigned i;