 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_fb_helper.c,v 1.18 2021/12/19 00:29:02 riastradh Exp $	*/
+/*	$NetBSD: drm_fb_helper.c,v 1.19 2021/12/19 01:03:22 riastradh Exp $	*/
 /*
  * Copyright (c) 2006-2009 Red Hat Inc.
  * Copyright (c) 2006-2008 Intel Corporation
  * Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
+ *
  * DRM framebuffer helper functions
+ *
  * 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
 @@ -20,27 +20,27 @@
  * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
  * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
+ *
  * Authors:
  *      Dave Airlie <airlied@linux.ie>
  *      Jesse Barnes <jesse.barnes@intel.com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.18 2021/12/19 00:29:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.19 2021/12/19 01:03:22 riastradh Exp $");
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/console.h>
 #include <linux/dma-buf.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sysrq.h>
 #include <linux/vmalloc.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_crtc.h>
 @@ -77,30 +77,32 @@ MODULE_PARM_DESC(drm_fbdev_overalloc,
  * This module_param *should* be removed as soon as possible and be
  * considered as a broken and legacy behaviour from a modern fbdev device.
  */
 #if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)
 static bool drm_leak_fbdev_smem = false;
 module_param_unsafe(drm_leak_fbdev_smem, bool, 0600);
 MODULE_PARM_DESC(drm_leak_fbdev_smem,
 		 "Allow unsafe leaking fbdev physical smem address [default=false]");
 #endif
 #ifdef __NetBSD__		/* XXX LIST_HEAD means something else */
 static struct list_head kernel_fb_helper_list =
     LIST_HEAD_INIT(kernel_fb_helper_list);
 #define	kernel_fb_helper_lock	drm_kernel_fb_helper_lock
 struct mutex kernel_fb_helper_lock;
 #else
 static LIST_HEAD(kernel_fb_helper_list);
 #endif
 static DEFINE_MUTEX(kernel_fb_helper_lock);
 #endif
 /**
  * DOC: fbdev helpers
+ *
  * The fb helper functions are useful to provide an fbdev on top of a drm kernel
  * mode setting driver. They can be used mostly independently from the crtc
  * helper functions used by many drivers to implement the kernel mode setting
  * interfaces.
+ *
  * Drivers that support a dumb buffer with a virtual address and mmap support,
  * should try out the generic fbdev emulation using drm_fbdev_generic_setup().
  * It will automatically set up deferred I/O if the driver requires a shadow
  * buffer.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_internal.h,v 1.8 2021/12/19 00:58:30 riastradh Exp $	*/
+/*	$NetBSD: drm_internal.h,v 1.9 2021/12/19 01:03:22 riastradh Exp $	*/
 /*
  * Copyright © 2014 Intel Corporation
  *   Daniel Vetter <daniel.vetter@ffwll.ch>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
+ *
  * The above copyright notice and this permission notice shall be included in
 @@ -237,13 +237,16 @@ int drm_syncobj_signal_ioctl(struct drm_
 int drm_syncobj_timeline_signal_ioctl(struct drm_device *dev, void *data,
 				      struct drm_file *file_private);
 int drm_syncobj_query_ioctl(struct drm_device *dev, void *data,
 			    struct drm_file *file_private);
 /* drm_framebuffer.c */
 void drm_framebuffer_print_info(struct drm_printer *p, unsigned int indent,
 				const struct drm_framebuffer *fb);
 int drm_framebuffer_debugfs_init(struct drm_minor *minor);
 /* drm_hdcp.c */
 int drm_setup_hdcp_srm(struct class *drm_class);
 void drm_teardown_hdcp_srm(struct class *drm_class);
 /* drm_fb_helper.c */
 extern struct mutex drm_kernel_fb_helper_lock;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_module.c,v 1.20 2021/12/19 00:58:31 riastradh Exp $	*/
+/*	$NetBSD: drm_module.c,v 1.21 2021/12/19 01:03:22 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_module.c,v 1.20 2021/12/19 00:58:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.21 2021/12/19 01:03:22 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/condvar.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/once.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <linux/mutex.h>
 @@ -114,26 +114,27 @@ drm_init(void)
 	if (error) {
 		drm_agp_hooks_fini();
 		return error;
+	}
 #endif
 	if (ISSET(boothowto, AB_DEBUG))
 		drm_debug = DRM_UT_CORE | DRM_UT_DRIVER | DRM_UT_KMS;
 	spin_lock_init(&drm_minor_lock);
 	idr_init(&drm_minors_idr);
 	srcu_init(&drm_unplug_srcu, "drmunplg");
 	linux_mutex_init(&drm_global_mutex);
 	linux_mutex_init(&drm_kernel_fb_helper_lock);
 	drm_connector_ida_init();
 	drm_global_init();
 	drm_panel_init_lock();
 	drm_bridge_init_lock();
 	drm_sysctl_init(&drm_def);
 	drm_i2c_encoders_init();
 	return 0;
+}
 int
 drm_guarantee_initialized(void)
+{
 @@ -146,26 +147,27 @@ drm_guarantee_initialized(void)
 #endif
+}
 static void
 drm_fini(void)
+{
 	drm_i2c_encoders_fini();
 	drm_sysctl_fini(&drm_def);
 	drm_bridge_fini_lock();
 	drm_panel_fini_lock();
 	drm_global_release();
 	drm_connector_ida_destroy();
 	linux_mutex_destroy(&drm_kernel_fb_helper_lock);
 	linux_mutex_destroy(&drm_global_mutex);
 	srcu_fini(&drm_unplug_srcu);
 	idr_destroy(&drm_minors_idr);
 	spin_lock_destroy(&drm_minor_lock);
 	drm_agp_hooks_fini();
+}
 int
 drm_irq_by_busid(struct drm_device *dev, void *data, struct drm_file *file)
+{
 	return -ENODEV;
+}