 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_dp_mst_helper.h,v 1.2 2018/08/27 04:58:37 riastradh Exp $	*/
+/*	$NetBSD: drm_dp_mst_helper.h,v 1.3 2018/08/27 06:06:41 riastradh Exp $	*/
 /*
  * Copyright © 2014 Red Hat.
+ *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
  * the above copyright notice appear in all copies and that both that copyright
  * notice and this permission notice appear in supporting documentation, and
  * that the name of the copyright holders not be used in advertising or
  * publicity pertaining to distribution of the software without specific,
  * written prior permission.  The copyright holders make no representations
  * about the suitability of this software for any purpose.  It is provided "as
  * is" without express or implied warranty.
 @@ -446,27 +446,29 @@ struct drm_dp_mst_topology_mgr {
 	/* qlock protects the upq/downq and in_progress,
 	   the mstb tx_slots and txmsg->state once they are queued */
 	struct mutex qlock;
 	struct list_head tx_msg_downq;
 	bool tx_down_in_progress;
 	/* payload info + lock for it */
 	struct mutex payload_lock;
 	struct drm_dp_vcpi **proposed_vcpis;
 	struct drm_dp_payload *payloads;
 	unsigned long payload_mask;
 	unsigned long vcpi_mask;
 #ifndef __NetBSD__
 	wait_queue_head_t tx_waitq;
 #endif
 	struct work_struct work;
 	struct work_struct tx_work;
 	struct list_head destroy_connector_list;
 	struct mutex destroy_connector_lock;
 	struct work_struct destroy_connector_work;
 };
 int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, struct device *dev, struct drm_dp_aux *aux, int max_dpcd_transaction_bytes, int max_payloads, int conn_base_id);
 void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fb.h,v 1.2 2014/03/18 18:20:43 riastradh Exp $	*/
+/*	$NetBSD: fb.h,v 1.3 2018/08/27 06:06:41 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.
 @@ -22,17 +22,20 @@
  * 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.
  */
 #ifndef _LINUX_FB_H_
 #define _LINUX_FB_H_
 #include <linux/kgdb.h>
 #include <linux/notifier.h>
 #define	PICOS2KHZ(PICOS)	(1000000000ul / (PICOS))
 #define	KHZ2PICOS(KHZ)		(1000000000ul / (KHZ))
 #endif  /* _LINUX_FB_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mm.h,v 1.6 2015/10/18 14:03:20 jmcneill Exp $	*/
+/*	$NetBSD: mm.h,v 1.7 2018/08/27 06:06:41 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,26 +25,28 @@
  * 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.
  */
 #ifndef _LINUX_MM_H_
 #define _LINUX_MM_H_
 #include <uvm/uvm_extern.h>
 #include <asm/page.h>
 #include <linux/shrinker.h>
 struct file;
 /* XXX Ugh bletch!  Whattakludge!  Linux's sense is reversed...  */
 #undef	PAGE_MASK
 #define	PAGE_MASK	(~(PAGE_SIZE-1))
 #define	PAGE_ALIGN(x)		(((x) + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1))
 #define	offset_in_page(x)	((x) & (PAGE_SIZE-1))
 struct sysinfo {
 	unsigned long totalram;
 	unsigned long totalhigh;
 @@ -66,14 +68,20 @@ vm_mmap(struct file *file __unused, unsi
     unsigned long size __unused, unsigned long prot __unused,
     unsigned long flags __unused, unsigned long token __unused)
+{
 	return -ENODEV;
+}
 static inline unsigned long
 get_num_physpages(void)
+{
 	return uvmexp.npages;
+}
 static inline void
 kvfree(void * ptr)
+{
 	panic("Unimplemented");
+}
 #endif  /* _LINUX_MM_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mutex.h,v 1.7 2014/08/23 08:03:33 riastradh Exp $	*/
+/*	$NetBSD: mutex.h,v 1.8 2018/08/27 06:06:41 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,26 +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.
  */
 #ifndef _LINUX_MUTEX_H_
 #define _LINUX_MUTEX_H_
 #include <sys/mutex.h>
 #include <lib/libkern/libkern.h> /* KASSERT */
 #include <linux/list.h>
 #define	__acquires(lock)	/* XXX lockdep stuff */
 #define	__releases(lock)	/* XXX lockdep stuff */
 struct mutex {
 	kmutex_t mtx_lock;
 };
 struct lock_class_key {
 };
 /* Name collision.  Pooh.  */
 static inline void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: types.h,v 1.4 2014/07/16 20:59:58 riastradh Exp $	*/
+/*	$NetBSD: types.h,v 1.5 2018/08/27 06:06:41 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.
 @@ -67,14 +67,20 @@ typedef uint64_t __be64;
  * This is used for absolute bus addresses, so it has to be bus_addr_t
  * and not bus_size_t; bus_addr_t is sometimes wider than bus_size_t.
  */
 typedef bus_addr_t resource_size_t;
 typedef paddr_t phys_addr_t;
 /* XXX Is this the right type?  */
 typedef unsigned long long cycles_t;
 /* XXX Not sure this is correct.  */
 typedef off_t loff_t;
 struct rcu_head {
 };
 #define DECLARE_BITMAP(name,size) size_t name[size/sizeof(size_t)]
 #endif  /* _LINUX_TYPES_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ww_mutex.h,v 1.11 2015/05/21 21:55:55 riastradh Exp $	*/
+/*	$NetBSD: ww_mutex.h,v 1.12 2018/08/27 06:06:41 riastradh Exp $	*/
 /*-
  * Copyright (c) 2014 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.
 @@ -27,26 +27,28 @@
  * 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.
  */
 #ifndef _ASM_WW_MUTEX_H_
 #define _ASM_WW_MUTEX_H_
 #include <sys/types.h>
 #include <sys/condvar.h>
 #include <sys/mutex.h>
 #include <sys/rbtree.h>
 #include <linux/mutex.h>
 struct ww_class {
 	volatile uint64_t	wwc_ticket;
 };
 #define	DEFINE_WW_CLASS(CLASS)						      \
 	struct ww_class CLASS = {					      \
 		.wwc_ticket = 0,					      \
+	}
 struct ww_acquire_ctx {
 	struct ww_class	*wwx_class __diagused;
 	struct lwp	*wwx_owner __diagused;
 	uint64_t	wwx_ticket;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_pci.c,v 1.18 2017/07/27 02:11:24 nonaka Exp $	*/
+/*	$NetBSD: drm_pci.c,v 1.19 2018/08/27 06:06:42 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,50 +20,49 @@
  * ``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.18 2017/07/27 02:11:24 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.19 2018/08/27 06:06:42 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <drm/drmP.h>
 struct drm_bus_irq_cookie {
 	pci_intr_handle_t *intr_handles;
 	void *ih_cookie;
 };
 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 **);
 static void	drm_pci_irq_uninstall(struct drm_device *,
 		    struct drm_bus_irq_cookie *);
 static const char *
 		drm_pci_get_name(struct drm_device *);
 static int	drm_pci_set_busid(struct drm_device *, struct drm_master *);
 static int	drm_pci_set_unique(struct drm_device *, struct drm_master *,
 		    struct drm_unique *);
 static int	drm_pci_irq_by_busid(struct drm_device *,
 		    struct drm_irq_busid *);
 const struct drm_bus drm_pci_bus = {
 	.bus_type = DRIVER_BUS_PCI,
 	.get_irq = drm_pci_get_irq,
 	.irq_install = drm_pci_irq_install,
 	.irq_uninstall = drm_pci_irq_uninstall,
 	.get_name = drm_pci_get_name,
 	.set_busid = drm_pci_set_busid,
 	.set_unique = drm_pci_set_unique,
 @@ -310,27 +309,27 @@ drm_pci_format_unique(struct drm_device
 	    domain, bus, device, function);
+}
 static int
 drm_pci_format_devname(struct drm_device *dev, const char *unique,
     char *buf, size_t size)
+{
 	return snprintf(buf, size, "%s@%s",
 	    device_xname(device_parent(dev->dev)),
 	    unique);
+}
-static int
+int
 drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
+{
 	int n;
 	char *buf;
 	n = drm_pci_format_unique(dev, NULL, 0);
 	if (n < 0)
 		return -ENOSPC;	/* XXX */
 	if (0xff < n)
 		n = 0xff;
 	buf = kzalloc(n + 1, GFP_KERNEL);
 	(void)drm_pci_format_unique(dev, buf, n + 1);