 @@ -1,53 +1,55 @@
-/*	$NetBSD: drm_connector.c,v 1.6 2021/12/19 11:06:54 riastradh Exp $	*/
+/*	$NetBSD: drm_connector.c,v 1.7 2021/12/19 12:32:01 riastradh Exp $	*/
 /*
  * Copyright (c) 2016 Intel Corporation
+ *
  * 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.
+ *
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_connector.c,v 1.6 2021/12/19 11:06:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_connector.c,v 1.7 2021/12/19 12:32:01 riastradh Exp $");
 #include <drm/drm_connector.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_utils.h>
 #include <drm/drm_print.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <linux/uaccess.h>
 #include "drm_crtc_internal.h"
 #include "drm_internal.h"
 #include <linux/nbsd-namespace.h>
 /**
  * DOC: overview
+ *
  * In DRM connectors are the general abstraction for display sinks, and include
  * als fixed panels or anything else that can display pixels in some form. As
  * opposed to all other KMS objects representing hardware (like CRTC, encoder or
  * plane abstractions) connectors can be hotplugged and unplugged at runtime.
  * Hence they are reference-counted using drm_connector_get() and
  * drm_connector_put().
+ *
  * KMS driver must create, initialize, register and attach at a &struct
  * drm_connector for each such sink. The instance is created as other KMS
  * objects and initialized by setting the following fields. The connector is
 @@ -246,31 +248,27 @@ int drm_connector_init(struct drm_device
 		goto out_put_id;
+	}
 	connector->name =
 		kasprintf(GFP_KERNEL, "%s-%d",
 			  drm_connector_enum_list[connector_type].name,
 			  connector->connector_type_id);
 	if (!connector->name) {
 		ret = -ENOMEM;
 		goto out_put_type_id;
+	}
 	INIT_LIST_HEAD(&connector->probed_modes);
 	INIT_LIST_HEAD(&connector->modes);
 #ifdef __NetBSD__
 	linux_mutex_init(&connector->mutex);
 #else
 	mutex_init(&connector->mutex);
 #endif
 	connector->edid_blob_ptr = NULL;
 	connector->tile_blob_ptr = NULL;
 	connector->status = connector_status_unknown;
 	connector->display_info.panel_orientation =
 		DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
 	drm_connector_get_cmdline_mode(connector);
 	/* We should add connectors at the end to avoid upsetting the connector
 	 * index too much. */
 	spin_lock_irq(&config->connector_list_lock);
 	list_add_tail(&connector->head, &config->connector_list);
 	config->num_connector++;
 @@ -463,31 +461,27 @@ void drm_connector_cleanup(struct drm_co
 	drm_mode_object_unregister(dev, &connector->base);
 	kfree(connector->name);
 	connector->name = NULL;
 	spin_lock_irq(&dev->mode_config.connector_list_lock);
 	list_del(&connector->head);
 	dev->mode_config.num_connector--;
 	spin_unlock_irq(&dev->mode_config.connector_list_lock);
 	WARN_ON(connector->state && !connector->funcs->atomic_destroy_state);
 	if (connector->state && connector->funcs->atomic_destroy_state)
 		connector->funcs->atomic_destroy_state(connector,
 						       connector->state);
 #ifdef __NetBSD__
 	linux_mutex_destroy(&connector->mutex);
 #else
 	mutex_destroy(&connector->mutex);
 #endif
 	memset(connector, 0, sizeof(*connector));
+}
 EXPORT_SYMBOL(drm_connector_cleanup);
 /**
  * drm_connector_register - register a connector
  * @connector: the connector to register
+ *
  * Register userspace interfaces for a connector. Only call this for connectors
  * which can be hotplugged after drm_dev_register() has been called already,
  * e.g. DP MST connectors. All other connectors will be registered automatically
  * when calling drm_dev_register().

 @@ -1,39 +1,39 @@
-/*	$NetBSD: drm_dp_helper.c,v 1.14 2021/12/19 00:56:40 riastradh Exp $	*/
+/*	$NetBSD: drm_dp_helper.c,v 1.15 2021/12/19 12:32:01 riastradh Exp $	*/
 /*
  * Copyright © 2009 Keith Packard
+ *
  * 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.
+ *
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.14 2021/12/19 00:56:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_dp_helper.c,v 1.15 2021/12/19 12:32:01 riastradh Exp $");
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/seq_file.h>
 #include <drm/drm_dp_helper.h>
 #include <drm/drm_print.h>
 #include <drm/drm_vblank.h>
 @@ -1065,26 +1065,27 @@ int drm_dp_aux_register(struct drm_dp_au
 	return 0;
+}
 EXPORT_SYMBOL(drm_dp_aux_register);
 /**
  * drm_dp_aux_unregister() - unregister an AUX adapter
  * @aux: DisplayPort AUX channel
  */
 void drm_dp_aux_unregister(struct drm_dp_aux *aux)
+{
 	drm_dp_aux_unregister_devnode(aux);
 	i2c_del_adapter(&aux->ddc);
 	mutex_destroy(&aux->cec.lock);
 	mutex_destroy(&aux->hw_mutex);
+}
 EXPORT_SYMBOL(drm_dp_aux_unregister);
 #define PSR_SETUP_TIME(x) [DP_PSR_SETUP_TIME_ ## x >> DP_PSR_SETUP_TIME_SHIFT] = (x)
 /**
  * drm_dp_psr_setup_time() - PSR setup in time usec
  * @psr_cap: PSR capabilities from DPCD
+ *
  * Returns:
  * PSR setup time for the panel in microseconds,  negative
  * error code on failure.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_drv.c,v 1.21 2021/12/19 11:10:09 riastradh Exp $	*/
+/*	$NetBSD: drm_drv.c,v 1.22 2021/12/19 12:32:01 riastradh Exp $	*/
 /*
  * Created: Fri Jan 19 10:48:35 2001 by faith@acm.org
+ *
  * Copyright 2001 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
+ *
  * Author Rickard E. (Rik) Faith <faith@valinux.com>
+ *
  * 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,
 @@ -19,27 +19,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
  * PRECISION INSIGHT 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_drv.c,v 1.21 2021/12/19 11:10:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.22 2021/12/19 12:32:01 riastradh Exp $");
 #include <linux/debugfs.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/mount.h>
 #include <linux/pseudo_fs.h>
 #include <linux/slab.h>
 #include <linux/srcu.h>
 #include <drm/drm_client.h>
 #include <drm/drm_color_mgmt.h>
 #include <drm/drm_drv.h>
 @@ -751,26 +751,27 @@ err_minors:
 	drm_fs_inode_free(dev->anon_inode);
 err_free:
 #ifdef __NetBSD__
 	sysmon_pswitch_unregister(&dev->sc_monitor_hotplug);
 err_pswitch:
 #endif
 #ifndef __NetBSD__		/* XXX drm sysfs */
 	put_device(dev->dev);
 #endif
 	mutex_destroy(&dev->master_mutex);
 	mutex_destroy(&dev->clientlist_mutex);
 	mutex_destroy(&dev->filelist_mutex);
 	mutex_destroy(&dev->struct_mutex);
 	spin_lock_destroy(&dev->event_lock);
 	drm_legacy_destroy_members(dev);
 	return ret;
+}
 EXPORT_SYMBOL(drm_dev_init);
 static void devm_drm_dev_init_release(void *data)
+{
 	drm_dev_put(data);
+}
 /**
  * devm_drm_dev_init - Resource managed drm_dev_init()
  * @parent: Parent device object
 @@ -833,26 +834,27 @@ void drm_dev_fini(struct drm_device *dev
 #ifdef __NetBSD__
 	sysmon_pswitch_unregister(&dev->sc_monitor_hotplug);
 #endif
 #ifndef __NetBSD__		/* XXX drm sysfs */
 	put_device(dev->dev);
 #endif
 	mutex_destroy(&dev->master_mutex);
 	mutex_destroy(&dev->clientlist_mutex);
 	mutex_destroy(&dev->filelist_mutex);
 	mutex_destroy(&dev->struct_mutex);
 	spin_lock_destroy(&dev->event_lock);
 	drm_legacy_destroy_members(dev);
 	kfree(dev->unique);
+}
 EXPORT_SYMBOL(drm_dev_fini);
 /**
  * drm_dev_alloc - Allocate new DRM device
  * @driver: DRM driver to allocate device for
  * @parent: Parent device object
+ *
  * Allocate and initialize a new DRM device. No device registration is done.
  * Call drm_dev_register() to advertice the device to user space and register it
  * with other core subsystems. This should be done last in the device

 @@ -1,40 +1,40 @@
-/*	$NetBSD: drm_flip_work.c,v 1.5 2021/12/18 23:44:57 riastradh Exp $	*/
+/*	$NetBSD: drm_flip_work.c,v 1.6 2021/12/19 12:32:01 riastradh Exp $	*/
 /*
  * Copyright (C) 2013 Red Hat
+ *
  * 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 (including the next
  * 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
  * THE AUTHORS OR COPYRIGHT HOLDERS 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_flip_work.c,v 1.5 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_flip_work.c,v 1.6 2021/12/19 12:32:01 riastradh Exp $");
 #include <linux/slab.h>
 #include <drm/drm_flip_work.h>
 #include <drm/drm_print.h>
 #include <drm/drm_util.h>
 /**
  * drm_flip_work_allocate_task - allocate a flip-work task
  * @data: data associated to the task
  * @flags: allocator flags
+ *
  * Allocate a drm_flip_task object and attach private data to it.
 @@ -161,15 +161,16 @@ void drm_flip_work_init(struct drm_flip_
 	INIT_WORK(&work->worker, flip_worker);
+}
 EXPORT_SYMBOL(drm_flip_work_init);
 /**
  * drm_flip_work_cleanup - cleans up flip-work
  * @work: the flip-work to cleanup
+ *
  * Destroy resources allocated for the flip-work
  */
 void drm_flip_work_cleanup(struct drm_flip_work *work)
+{
 	WARN_ON(!list_empty(&work->queued) || !list_empty(&work->commited));
 	spin_lock_destroy(&work->lock);
+}
 EXPORT_SYMBOL(drm_flip_work_cleanup);

 @@ -1,39 +1,39 @@
-/*	$NetBSD: drm_mode_config.c,v 1.4 2021/12/19 10:47:29 riastradh Exp $	*/
+/*	$NetBSD: drm_mode_config.c,v 1.5 2021/12/19 12:32:01 riastradh Exp $	*/
 /*
  * Copyright (c) 2016 Intel Corporation
+ *
  * 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.
+ *
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_mode_config.c,v 1.4 2021/12/19 10:47:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_mode_config.c,v 1.5 2021/12/19 12:32:01 riastradh Exp $");
 #include <linux/uaccess.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_encoder.h>
 #include <drm/drm_file.h>
 #include <drm/drm_mode_config.h>
 #include <drm/drm_print.h>
 #include <linux/dma-resv.h>
 #include "drm_crtc_internal.h"
 #include "drm_internal.h"
 @@ -523,19 +523,24 @@ void drm_mode_config_cleanup(struct drm_
 	 * would actually deadlock with the drm_framebuffer_cleanup function.
+	 *
 	 * Also, if there are any framebuffers left, that's a driver leak now,
 	 * so politely WARN about this.
 	 */
 	WARN_ON(!list_empty(&dev->mode_config.fb_list));
 	list_for_each_entry_safe(fb, fbt, &dev->mode_config.fb_list, head) {
 		struct drm_printer p = drm_debug_printer("[leaked fb]");
 		drm_printf(&p, "framebuffer[%u]:\n", fb->base.id);
 		drm_framebuffer_print_info(&p, 1, fb);
 		drm_framebuffer_free(&fb->base.refcount);
+	}
 	spin_lock_destroy(&dev->mode_config.connector_list_lock);
 	ida_destroy(&dev->mode_config.connector_ida);
 	idr_destroy(&dev->mode_config.tile_idr);
 	idr_destroy(&dev->mode_config.object_idr);
 	mutex_destroy(&dev->mode_config.blob_lock);
 	mutex_destroy(&dev->mode_config.fb_lock);
 	mutex_destroy(&dev->mode_config.idr_mutex);
 	drm_modeset_lock_fini(&dev->mode_config.connection_mutex);
 	mutex_destroy(&dev->mode_config.mutex);
+}
 EXPORT_SYMBOL(drm_mode_config_cleanup);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_syncobj.c,v 1.4 2021/12/19 10:39:14 riastradh Exp $	*/
+/*	$NetBSD: drm_syncobj.c,v 1.5 2021/12/19 12:32:01 riastradh Exp $	*/
 /*
  * Copyright 2017 Red Hat
  * Parts ported from amdgpu (fence wait code).
  * Copyright 2016 Advanced Micro Devices, Inc.
+ *
  * 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:
+ *
 @@ -115,27 +115,27 @@
  * &DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE lets the client
  * import/export the syncobj's current fence from/to a &sync_file.
  * When a syncobj is exported to a sync file, that sync file wraps the
  * sycnobj's fence at the time of export and any later signal or reset
  * operations on the syncobj will not affect the exported sync file.
  * When a sync file is imported into a syncobj, the syncobj's fence is set
  * to the fence wrapped by that sync file.
  * Because sync files are immutable, resetting or signaling the syncobj
  * will not affect any sync files whose fences have been imported into the
  * syncobj.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_syncobj.c,v 1.4 2021/12/19 10:39:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_syncobj.c,v 1.5 2021/12/19 12:32:01 riastradh Exp $");
 #include <linux/anon_inodes.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/sched/signal.h>
 #include <linux/sync_file.h>
 #include <linux/uaccess.h>
 #include <drm/drm.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_print.h>
 @@ -455,26 +455,27 @@ EXPORT_SYMBOL(drm_syncobj_find_fence);
 /**
  * drm_syncobj_free - free a sync object.
  * @kref: kref to free.
+ *
  * Only to be called from kref_put in drm_syncobj_put.
  */
 void drm_syncobj_free(struct kref *kref)
+{
 	struct drm_syncobj *syncobj = container_of(kref,
 						   struct drm_syncobj,
 						   refcount);
 	drm_syncobj_replace_fence(syncobj, NULL);
 	spin_lock_destroy(&syncobj->lock);
 	kfree(syncobj);
+}
 EXPORT_SYMBOL(drm_syncobj_free);
 /**
  * drm_syncobj_create - create a new syncobj
  * @out_syncobj: returned syncobj
  * @flags: DRM_SYNCOBJ_* flags
  * @fence: if non-NULL, the syncobj will represent this fence
+ *
  * This is the first function to create a sync object. After creating, drivers
  * probably want to make it available to userspace, either through
  * drm_syncobj_get_handle() or drm_syncobj_get_fd().

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_vblank.c,v 1.13 2021/12/19 12:24:57 riastradh Exp $	*/
+/*	$NetBSD: drm_vblank.c,v 1.14 2021/12/19 12:32:01 riastradh Exp $	*/
 /*
  * drm_irq.c IRQ and vblank support
+ *
  * \author Rickard E. (Rik) Faith <faith@valinux.com>
  * \author Gareth Hughes <gareth@valinux.com>
+ *
  * 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:
 @@ -17,27 +17,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_vblank.c,v 1.13 2021/12/19 12:24:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_vblank.c,v 1.14 2021/12/19 12:32:01 riastradh Exp $");
 #include <linux/export.h>
 #include <linux/moduleparam.h>
 #include <linux/math64.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_framebuffer.h>
 #include <drm/drm_print.h>
 #include <drm/drm_vblank.h>
 #include "drm_internal.h"
 #include "drm_trace.h"
 @@ -470,26 +470,28 @@ void drm_vblank_cleanup(struct drm_devic
 	for (pipe = 0; pipe < dev->num_crtcs; pipe++) {
 		struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 		WARN_ON(READ_ONCE(vblank->enabled) &&
 			drm_core_check_feature(dev, DRIVER_MODESET));
 		del_timer_sync(&vblank->disable_timer);
 		seqlock_destroy(&vblank->seqlock);
+	}
 	kfree(dev->vblank);
 	dev->num_crtcs = 0;
 	spin_lock_destroy(&dev->vblank_time_lock);
+}
 /**
  * drm_vblank_init - initialize vblank support
  * @dev: DRM device
  * @num_crtcs: number of CRTCs supported by @dev
+ *
  * This function initializes vblank support for @num_crtcs display pipelines.
  * Cleanup is handled by the DRM core, or through calling drm_dev_fini() for
  * drivers with a &drm_driver.release callback.
+ *
  * Returns:
  * Zero on success or a negative error code on failure.