 @@ -1,14 +1,14 @@
-/*	$NetBSD: amdgpu_device.c,v 1.17 2022/09/20 23:01:42 mrg Exp $	*/
+/*	$NetBSD: amdgpu_device.c,v 1.17.4.1 2023/02/24 14:11:29 martin Exp $	*/
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
  * Copyright 2008 Red Hat Inc.
  * Copyright 2009 Jerome Glisse.
+ *
  * 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:
+ *
 @@ -18,27 +18,27 @@
  * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
  * Authors: Dave Airlie
  *          Alex Deucher
  *          Jerome Glisse
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.17 2022/09/20 23:01:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_device.c,v 1.17.4.1 2023/02/24 14:11:29 martin Exp $");
 #include <linux/power_supply.h>
 #include <linux/kthread.h>
 #include <linux/module.h>
 #include <linux/console.h>
 #include <linux/slab.h>
 #include <linux/reboot.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
 #include <linux/vgaarb.h>
 #include <linux/vga_switcheroo.h>
 @@ -473,39 +473,39 @@ void amdgpu_mm_wdoorbell(struct amdgpu_d
+ *
  * @adev: amdgpu_device pointer
  * @index: doorbell index
+ *
  * Returns the value in the doorbell aperture at the
  * requested doorbell index (VEGA10+).
  */
 u64 amdgpu_mm_rdoorbell64(struct amdgpu_device *adev, u32 index)
+{
 	if (index < adev->doorbell.num_doorbells) {
 #ifdef __NetBSD__
 #ifdef _LP64
 		return bus_space_read_8(adev->doorbell.bst, adev->doorbell.bsh,
 *index);
 #else
 		uint64_t lo, hi;
 #if _BYTE_ORDER == _LITTLE_ENDIAN
 		lo = bus_space_read_4(adev->doorbell.bst, adev->doorbell.bsh,
 *index);
 		hi = bus_space_read_4(adev->doorbell.bst, adev->doorbell.bsh,
 *index + 4);
 #else
 		hi = bus_space_read_4(adev->doorbell.bst, adev->doorbell.bsh,
 *index);
 		lo = bus_space_read_4(adev->doorbell.bst, adev->doorbell.bsh,
 *index + 4);
 #endif
 		return lo | (hi << 32);
 #endif
 #else
 		return atomic64_read((atomic64_t *)(adev->doorbell.ptr + index));
 #endif
 	} else {
 		DRM_ERROR("reading beyond doorbell aperture: 0x%08x!\n", index);
 		return 0;
+	}
+}
 /**
 @@ -514,41 +514,41 @@ u64 amdgpu_mm_rdoorbell64(struct amdgpu_
  * @adev: amdgpu_device pointer
  * @index: doorbell index
  * @v: value to write
+ *
  * Writes @v to the doorbell aperture at the
  * requested doorbell index (VEGA10+).
  */
 void amdgpu_mm_wdoorbell64(struct amdgpu_device *adev, u32 index, u64 v)
+{
 	if (index < adev->doorbell.num_doorbells) {
 #ifdef __NetBSD__
 #ifdef _LP64
 		bus_space_write_8(adev->doorbell.bst, adev->doorbell.bsh,
 *index, v);
 #else
 		/*
 		 * XXX This might not be as atomic as one might hope...
 		 */
 #if _BYTE_ORDER == _LITTLE_ENDIAN
 		bus_space_write_4(adev->doorbell.bst, adev->doorbell.bsh,
 *index, v & 0xffffffffU);
 		bus_space_write_4(adev->doorbell.bst, adev->doorbell.bsh,
 *index + 4, v >> 32);
 #else
 		bus_space_write_4(adev->doorbell.bst, adev->doorbell.bsh,
 *index, v >> 32);
 		bus_space_write_4(adev->doorbell.bst, adev->doorbell.bsh,
 *index + 4, v & 0xffffffffU);
 #endif
 #endif
 #else
 		atomic64_set((atomic64_t *)(adev->doorbell.ptr + index), v);
 #endif
 	} else {
 		DRM_ERROR("writing beyond doorbell aperture: 0x%08x!\n", index);
+	}
+}
 /**
  * amdgpu_invalid_rreg - dummy reg read function
+ *