Tue Apr 16 14:34:03 2024 UTC (24d)

drm: Set CONFIG_ACPI in linux/acpi.h and make it build.

Leave a little ACPI-related functionality disabled for now, like
getting EDID out of ACPI -- needs a bit more work to make this work,
and I don't have hardware to work on that.

Should help with failures of the forms:

- unable to locate a BIOS ROM
- bios: unable to locate usable image

on various machines.


(riastradh)

diff -r1.30 -r1.31 src/sys/external/bsd/drm2/amdgpu/files.amdgpu
diff -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu.h
diff -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c
diff -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_hwmgr.c
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_smu7_hwmgr.c
diff -r1.48 -r1.49 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.h
diff -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_opregion.h
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drv.h
diff -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.h
diff -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c
diff -r1.9 -r1.10 src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h
diff -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_acpi.c
diff -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_tegra.c
diff -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/priv.h
diff -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
diff -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c
diff -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowacpi.c
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c
diff -r1.11 -r1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c
diff -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h
diff -r1.13 -r1.14 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
diff -r0 -r1.1 src/sys/external/bsd/drm2/include/acpi/acpi_bus.h
diff -r1.2 -r1.3 src/sys/external/bsd/drm2/include/acpi/video.h
diff -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/acpi.h
diff -r0 -r1.1 src/sys/external/bsd/drm2/include/linux/mxm-wmi.h
diff -r1.1 -r1.2 src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h
diff -r1.39 -r1.40 src/sys/external/bsd/drm2/nouveau/files.nouveau
diff -r1.39 -r1.40 src/sys/external/bsd/drm2/radeon/files.radeon
diff -r1.8 -r1.9 src/sys/modules/amdgpu/Makefile

--- src/sys/external/bsd/drm2/amdgpu/files.amdgpu 2023/07/14 13:05:59	1.30
+++ src/sys/external/bsd/drm2/amdgpu/files.amdgpu 2024/04/16 14:34:01	1.31

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.amdgpu,v 1.30 2023/07/14 13:05:59 riastradh Exp $
+#	$NetBSD: files.amdgpu,v 1.31 2024/04/16 14:34:01 riastradh Exp $
 version	20180827
 define	amdgpufbbus	{ }
 device	amdgpu: drmkms, drmkms_pci, drmkms_sched, drmkms_ttm, amdgpufbbus, firmload
 attach	amdgpu at pci
 makeoptions	amdgpu		"CPPFLAGS.amdgpu"+="${CPPFLAGS.drmkms}"
 defflag	opt_amdgpu_cik.h AMDGPU_CIK
 device	amdgpufb: amdgpufbbus, drmfb, drmfb_pci, wsemuldisplaydev
 attach	amdgpufb at amdgpufbbus
 makeoptions	amdgpufb	"CPPFLAGS.amdgpufb"+="${CPPFLAGS.amdgpu}"
 @@ -344,27 +344,27 @@ file	external/bsd/drm2/dist/drm/amd/amdg
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_iceland_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_polaris10_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_smu10_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_smu7_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_smu8_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_smu9_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_tonga_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_vega10_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_vega12_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_vega20_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr/amdgpu_vegam_smumgr.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acp.c	amdgpu
-#file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c	amdgpu
+file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_afmt.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_amdkfd.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_arct_reg_init.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_athub_v1_0.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_athub_v2_0.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atom.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_crtc.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_dp.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_encoders.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atombios_i2c.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_atomfirmware.c	amdgpu
 file	external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_benchmark.c	amdgpu

--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu.h 2022/10/08 19:06:30	1.8
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu.h 2024/04/16 14:34:01	1.9

 @@ -1,14 +1,14 @@
-/*	$NetBSD: amdgpu.h,v 1.8 2022/10/08 19:06:30 riastradh Exp $	*/
+/*	$NetBSD: amdgpu.h,v 1.9 2024/04/16 14:34:01 riastradh 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:
+ *
 @@ -36,26 +36,27 @@
 #ifdef AMDGPU_CIK
 #define	CONFIG_DRM_AMDGPU_CIK	1
 #endif
 #include "amdgpu_ctx.h"
 #include <linux/atomic.h>
 #include <linux/wait.h>
 #include <linux/list.h>
 #include <linux/kref.h>
 #include <linux/rbtree.h>
 #include <linux/hashtable.h>
 #include <linux/dma-fence.h>
 #include <linux/acpi.h>
 #include <drm/ttm/ttm_bo_api.h>
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
 #include <drm/ttm/ttm_module.h>
 #include <drm/ttm/ttm_execbuf_util.h>
 #include <drm/amdgpu_drm.h>
 #include <drm/drm_gem.h>
 #include <drm/drm_ioctl.h>
 #include <drm/gpu_scheduler.h>
 #include <kgd_kfd_interface.h>

--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c 2022/02/27 14:24:26	1.5
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c 2024/04/16 14:34:01	1.6

 @@ -1,55 +1,63 @@
-/*	$NetBSD: amdgpu_acpi.c,v 1.5 2022/02/27 14:24:26 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_acpi.c,v 1.6 2024/04/16 14:34:01 riastradh Exp $	*/
 /*
  * Copyright 2012 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:
+ *
  * The above copyright notice and this permission notice 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 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_acpi.c,v 1.5 2022/02/27 14:24:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_acpi.c,v 1.6 2024/04/16 14:34:01 riastradh Exp $");
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <linux/power_supply.h>
 #include <linux/pm_runtime.h>
 #include <acpi/video.h>
 #include <drm/drm_crtc_helper.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_display.h"
 #include "amd_acpi.h"
 #include "atom.h"
 #ifdef __NetBSD__
 #include <dev/acpi/acpi_pci.h>
 #include <dev/acpi/acpireg.h>
 #define	_COMPONENT	ACPI_DISPLAY_COMPONENT
 ACPI_MODULE_NAME("radeon_acpi")
 #include <linux/nbsd-namespace-acpi.h>
 #endif
 struct amdgpu_atif_notification_cfg {
 	bool enabled;
 	int command_code;
 };
 struct amdgpu_atif_notifications {
 	bool thermal_state;
 	bool forced_power_state;
 	bool system_power_state;
 	bool brightness_change;
 	bool dgpu_display_event;
 	bool gpu_package_power_limit;
 };
 @@ -352,26 +360,28 @@ static int amdgpu_atif_query_backlight_c
 	size = min(sizeof(characteristics), size);
 	memcpy(&characteristics, info->buffer.pointer, size);
 	atif->backlight_caps.caps_valid = true;
 	atif->backlight_caps.min_input_signal =
 			characteristics.min_input_signal;
 	atif->backlight_caps.max_input_signal =
 			characteristics.max_input_signal;
 out:
 	ACPI_FREE(info);
 	return err;
+}
 #ifndef __NetBSD__		/* XXX amdgpu acpi */
 /**
  * amdgpu_atif_get_sbios_requests - get requested sbios event
+ *
  * @handle: acpi handle
  * @req: atif sbios request struct
+ *
  * Execute the ATIF_FUNCTION_GET_SYSTEM_BIOS_REQUESTS ATIF function
  * to determine what requests the sbios is making to the driver
  * (all asics).
  * Returns 0 on success, error on failure.
  */
 static int amdgpu_atif_get_sbios_requests(struct amdgpu_atif *atif,
 					  struct atif_sbios_requests *req)
 @@ -478,26 +488,28 @@ static int amdgpu_atif_handler(struct am
+			}
+		}
 		/* TODO: check other events */
+	}
 	/* We've handled the event, stop the notifier chain. The ACPI interface
 	 * overloads ACPI_VIDEO_NOTIFY_PROBE, we don't want to send that to
 	 * userspace if the event was generated only to signal a SBIOS
 	 * request.
 	 */
 	return NOTIFY_BAD;
+}
 #endif	/* __NetBSD__ */
 /* Call the ATCS method
  */
 /**
  * amdgpu_atcs_call - call an ATCS method
+ *
  * @handle: acpi handle
  * @function: the ATCS function to execute
  * @params: ATCS function params
+ *
  * Executes the requested ATCS function (all asics).
  * Returns a pointer to the acpi output buffer.
  */
 static union acpi_object *amdgpu_atcs_call(acpi_handle handle, int function,
 @@ -625,27 +637,37 @@ bool amdgpu_acpi_is_pcie_performance_req
  * @adev: amdgpu_device pointer
+ *
  * Executes the PCIE_DEVICE_READY_NOTIFICATION method
  * (all asics).
  * returns 0 on success, error on failure.
  */
 int amdgpu_acpi_pcie_notify_device_ready(struct amdgpu_device *adev)
+{
 	acpi_handle handle;
 	union acpi_object *info;
 	struct amdgpu_atcs *atcs = &adev->atcs;
 	/* Get the device handle */
 #ifdef __NetBSD__
 	const struct pci_attach_args *pa = &adev->pdev->pd_pa;
 	struct acpi_devnode *const d =
 	    acpi_pcidev_find(pci_get_segment(pa->pa_pc),
 		pa->pa_bus, pa->pa_device, pa->pa_function);
 	if (d == NULL)
 		return -EINVAL;
 	handle = d->ad_handle;
 #else
 	handle = ACPI_HANDLE(&adev->pdev->dev);
 #endif
 	if (!handle)
 		return -EINVAL;
 	if (!atcs->functions.pcie_dev_rdy)
 		return -EINVAL;
 	info = amdgpu_atcs_call(handle, ATCS_FUNCTION_PCIE_DEVICE_READY_NOTIFICATION, NULL);
 	if (!info)
 		return -EIO;
 	ACPI_FREE(info);
 	return 0;
 @@ -668,27 +690,37 @@ int amdgpu_acpi_pcie_performance_request
 	acpi_handle handle;
 	union acpi_object *info;
 	struct amdgpu_atcs *atcs = &adev->atcs;
 	struct atcs_pref_req_input atcs_input;
 	struct atcs_pref_req_output atcs_output;
 	struct acpi_buffer params;
 	size_t size;
 	u32 retry = 3;
 	if (amdgpu_acpi_pcie_notify_device_ready(adev))
 		return -EINVAL;
 	/* Get the device handle */
 #ifdef __NetBSD__
 	const struct pci_attach_args *pa = &adev->pdev->pd_pa;
 	struct acpi_devnode *const d =
 	    acpi_pcidev_find(pci_get_segment(pa->pa_pc),
 		pa->pa_bus, pa->pa_device, pa->pa_function);
 	if (d == NULL)
 		return -EINVAL;
 	handle = d->ad_handle;
 #else
 	handle = ACPI_HANDLE(&adev->pdev->dev);
 #endif
 	if (!handle)
 		return -EINVAL;
 	if (!atcs->functions.pcie_perf_req)
 		return -EINVAL;
 	atcs_input.size = sizeof(struct atcs_pref_req_input);
 	/* client id (bit 2-0: func num, 7-3: dev num, 15-8: bus num) */
 	atcs_input.client_id = adev->pdev->devfn | (adev->pdev->bus->number << 8);
 	atcs_input.valid_flags_mask = ATCS_VALID_FLAGS_MASK;
 	atcs_input.flags = ATCS_WAIT_FOR_COMPLETION;
 	if (advertise)
 		atcs_input.flags |= ATCS_ADVERTISE_CAPS;
 @@ -733,65 +765,77 @@ int amdgpu_acpi_pcie_performance_request
+}
 /**
  * amdgpu_acpi_event - handle notify events
+ *
  * @nb: notifier block
  * @val: val
  * @data: acpi event
+ *
  * Calls relevant amdgpu functions in response to various
  * acpi events.
  * Returns NOTIFY code
  */
 #ifndef __NetBSD__		/* XXX amdgpu acpi */
 static int amdgpu_acpi_event(struct notifier_block *nb,
 			     unsigned long val,
 			     void *data)
+{
 	struct amdgpu_device *adev = container_of(nb, struct amdgpu_device, acpi_nb);
 	struct acpi_bus_event *entry = (struct acpi_bus_event *)data;
 	if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
 		if (power_supply_is_system_supplied() > 0)
 			DRM_DEBUG_DRIVER("pm: AC\n");
 		else
 			DRM_DEBUG_DRIVER("pm: DC\n");
 		amdgpu_pm_acpi_event_handler(adev);
+	}
 	/* Check for pending SBIOS requests */
 	return amdgpu_atif_handler(adev, entry);
+}
 #endif
 /* Call all ACPI methods here */
 /**
  * amdgpu_acpi_init - init driver acpi support
+ *
  * @adev: amdgpu_device pointer
+ *
  * Verifies the AMD ACPI interfaces and registers with the acpi
  * notifier chain (all asics).
  * Returns 0 on success, error on failure.
  */
 int amdgpu_acpi_init(struct amdgpu_device *adev)
+{
 	acpi_handle handle, atif_handle;
 	struct amdgpu_atif *atif;
 	struct amdgpu_atcs *atcs = &adev->atcs;
 	int ret;
 	/* Get the device handle */
 #ifdef __NetBSD__
 	const struct pci_attach_args *pa = &adev->pdev->pd_pa;
 	struct acpi_devnode *const d =
 	    acpi_pcidev_find(pci_get_segment(pa->pa_pc),
 		pa->pa_bus, pa->pa_device, pa->pa_function);
 	if (d == NULL)
 		return -EINVAL;
 	handle = d->ad_handle;
 #else
 	handle = ACPI_HANDLE(&adev->pdev->dev);
 #endif
 	if (!adev->bios || !handle)
 		return 0;
 	/* Call the ATCS method */
 	ret = amdgpu_atcs_verify_interface(handle, atcs);
 	if (ret) {
 		DRM_DEBUG_DRIVER("Call to ATCS verify_interface failed: %d\n", ret);
+	}
 	/* Probe for ATIF, and initialize it if found */
 	atif_handle = amdgpu_atif_probe_handle(handle);
 	if (!atif_handle)
 @@ -852,43 +896,47 @@ int amdgpu_acpi_init(struct amdgpu_devic
 	if (atif->functions.query_backlight_transfer_characteristics) {
 		ret = amdgpu_atif_query_backlight_caps(atif);
 		if (ret) {
 			DRM_DEBUG_DRIVER("Call to QUERY_BACKLIGHT_TRANSFER_CHARACTERISTICS failed: %d\n",
 					ret);
 			atif->backlight_caps.caps_valid = false;
+		}
 	} else {
 		atif->backlight_caps.caps_valid = false;
+	}
 out:
 #ifndef __NetBSD__		/* XXX amdgpu acpi */
 	adev->acpi_nb.notifier_call = amdgpu_acpi_event;
 	register_acpi_notifier(&adev->acpi_nb);
 #endif
 	return ret;
+}
 void amdgpu_acpi_get_backlight_caps(struct amdgpu_device *adev,
 		struct amdgpu_dm_backlight_caps *caps)
+{
 	if (!adev->atif) {
 		caps->caps_valid = false;
 		return;
+	}
 	caps->caps_valid = adev->atif->backlight_caps.caps_valid;
 	caps->min_input_signal = adev->atif->backlight_caps.min_input_signal;
 	caps->max_input_signal = adev->atif->backlight_caps.max_input_signal;
+}
 /**
  * amdgpu_acpi_fini - tear down driver acpi support
+ *
  * @adev: amdgpu_device pointer
+ *
  * Unregisters with the acpi notifier chain (all asics).
  */
 void amdgpu_acpi_fini(struct amdgpu_device *adev)
+{
 #ifndef __NetBSD__		/* XXX radeon acpi */
 	unregister_acpi_notifier(&adev->acpi_nb);
 #endif
 	kfree(adev->atif);
+}

--- src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_hwmgr.c 2021/12/18 23:45:26	1.2
+++ src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_hwmgr.c 2024/04/16 14:34:01	1.3

 @@ -1,47 +1,48 @@
-/*	$NetBSD: amdgpu_hwmgr.c,v 1.2 2021/12/18 23:45:26 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_hwmgr.c,v 1.3 2024/04/16 14:34:01 riastradh Exp $	*/
 /*
  * Copyright 2015 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:
+ *
  * The above copyright notice and this permission notice 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 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_hwmgr.c,v 1.2 2021/12/18 23:45:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_hwmgr.c,v 1.3 2024/04/16 14:34:01 riastradh Exp $");
 #include "pp_debug.h"
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <drm/amdgpu_drm.h>
 #include "power_state.h"
 #include "hwmgr.h"
 #include "ppsmc.h"
 #include "amd_acpi.h"
 #include "pp_psm.h"
 extern const struct pp_smumgr_func ci_smu_funcs;
 extern const struct pp_smumgr_func smu8_smu_funcs;
 extern const struct pp_smumgr_func iceland_smu_funcs;
 extern const struct pp_smumgr_func tonga_smu_funcs;
 extern const struct pp_smumgr_func fiji_smu_funcs;
 extern const struct pp_smumgr_func polaris10_smu_funcs;

--- src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_smu7_hwmgr.c 2021/12/19 12:37:54	1.4
+++ src/sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_smu7_hwmgr.c 2024/04/16 14:34:01	1.5

 @@ -1,46 +1,47 @@
-/*	$NetBSD: amdgpu_smu7_hwmgr.c,v 1.4 2021/12/19 12:37:54 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_smu7_hwmgr.c,v 1.5 2024/04/16 14:34:01 riastradh Exp $	*/
 /*
  * Copyright 2015 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:
+ *
  * The above copyright notice and this permission notice 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 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_smu7_hwmgr.c,v 1.4 2021/12/19 12:37:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_smu7_hwmgr.c,v 1.5 2024/04/16 14:34:01 riastradh Exp $");
 #include "pp_debug.h"
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
 #include <asm/div64.h>
 #include <drm/amdgpu_drm.h>
 #include "ppatomctrl.h"
 #include "atombios.h"
 #include "pptable_v1_0.h"
 #include "pppcielanes.h"
 #include "amd_pcie_helpers.h"
 #include "hardwaremanager.h"
 #include "process_pptables_v1_0.h"
 #include "cgs_common.h"
 #include "smu7_common.h"

--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 2022/09/22 14:37:38	1.48
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h 2024/04/16 14:34:02	1.49

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_drv.h,v 1.48 2022/09/22 14:37:38 riastradh Exp $	*/
+/*	$NetBSD: i915_drv.h,v 1.49 2024/04/16 14:34:02 riastradh Exp $	*/
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
 /*
+ *
  * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
+ *
  * 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, sub license, and/or sell copies of the Software, and to
 @@ -22,53 +22,45 @@
  * 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 NON-INFRINGEMENT.
  * IN NO EVENT SHALL TUNGSTEN GRAPHICS 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.
+ *
  */
 #ifndef _I915_DRV_H_
 #define _I915_DRV_H_
 #if defined(__NetBSD__)
 #ifdef _KERNEL_OPT
 #include "acpica.h"
 #endif	/* _KERNEL_OPT */
 #if (NACPICA > 0)
 #define CONFIG_ACPI
 #endif	/* NACPICA > 0 */
 #endif	/* __NetBSD__ */
 #include <uapi/drm/i915_drm.h>
 #include <uapi/drm/drm_fourcc.h>
 #include <linux/io-mapping.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/backlight.h>
 #include <linux/hash.h>
 #include <linux/intel-iommu.h>
 #include <linux/kref.h>
 #include <linux/mm_types.h>
 #include <linux/perf_event.h>
 #include <linux/pm_qos.h>
 #include <linux/dma-resv.h>
 #include <linux/shmem_fs.h>
 #include <linux/stackdepot.h>
 #include <linux/xarray.h>
 #include <linux/uuid.h>
 #include <linux/acpi.h>
 #include <drm/intel-gtt.h>
 #include <drm/drm_legacy.h> /* for struct drm_dma_handle */
 #include <drm/drm_gem.h>
 #include <drm/drm_auth.h>
 #include <drm/drm_cache.h>
 #include <drm/drm_util.h>
 #include <drm/drm_dsc.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_connector.h>
 #include <drm/i915_mei_hdcp_interface.h>
 #include "i915_fixed.h"

--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.h 2021/12/19 11:16:17	1.4
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.h 2024/04/16 14:34:01	1.5

 @@ -1,23 +1,25 @@
-/*	$NetBSD: intel_acpi.h,v 1.4 2021/12/19 11:16:17 riastradh Exp $	*/
+/*	$NetBSD: intel_acpi.h,v 1.5 2024/04/16 14:34:01 riastradh Exp $	*/
 /* SPDX-License-Identifier: MIT */
 /*
  * Copyright © 2019 Intel Corporation
  */
 #ifndef __INTEL_ACPI_H__
 #define __INTEL_ACPI_H__
 #include <linux/acpi.h>
 struct drm_i915_private;
 #ifdef CONFIG_ACPI
 #ifdef __NetBSD__
 void intel_register_dsm_handler(struct drm_i915_private *);
 #else
 void intel_register_dsm_handler(void);
 #endif
 void intel_unregister_dsm_handler(void);
 #else
 #ifdef __NetBSD__
 static inline void intel_register_dsm_handler(struct drm_i915_private *i915) { return; }
 #else

--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_opregion.h 2022/02/27 21:22:01	1.5
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_opregion.h 2024/04/16 14:34:01	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_opregion.h,v 1.5 2022/02/27 21:22:01 riastradh Exp $	*/
+/*	$NetBSD: intel_opregion.h,v 1.6 2024/04/16 14:34:01 riastradh Exp $	*/
 /*
  * Copyright © 2008-2017 Intel Corporation
+ *
  * 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
 @@ -19,26 +19,27 @@
  * 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.
+ *
  */
 #ifndef _INTEL_OPREGION_H_
 #define _INTEL_OPREGION_H_
 #include <linux/workqueue.h>
 #include <linux/pci.h>
 #include <linux/acpi.h>
 struct drm_i915_private;
 struct intel_encoder;
 struct opregion_header;
 struct opregion_acpi;
 struct opregion_swsci;
 struct opregion_asle;
 struct intel_opregion {
 	struct opregion_header *header;
 	struct opregion_acpi *acpi;
 	struct opregion_swsci *swsci;

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c 2022/02/27 14:24:27	1.4
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c 2024/04/16 14:34:02	1.5

 @@ -1,30 +1,37 @@
-/*	$NetBSD: nouveau_acpi.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $	*/
+/*	$NetBSD: nouveau_acpi.c,v 1.5 2024/04/16 14:34:02 riastradh Exp $	*/
 // SPDX-License-Identifier: MIT
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_acpi.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_acpi.c,v 1.5 2024/04/16 14:34:02 riastradh Exp $");
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
 #include <linux/mxm-wmi.h>
 #include <linux/vga_switcheroo.h>
 #include <drm/drm_edid.h>
 #include <acpi/video.h>
 #include "nouveau_drv.h"
 #include "nouveau_acpi.h"
 #ifdef __NetBSD__
 #include <dev/acpi/acpireg.h>
 #define	_COMPONENT	ACPI_DISPLAY_COMPONENT
 ACPI_MODULE_NAME("nouveau_acpi")
 #include <linux/nbsd-namespace-acpi.h>
 #endif
 #define NOUVEAU_DSM_LED 0x02
 #define NOUVEAU_DSM_LED_STATE 0x00
 #define NOUVEAU_DSM_LED_OFF 0x10
 #define NOUVEAU_DSM_LED_STAMINA 0x11
 #define NOUVEAU_DSM_LED_SPEED 0x12
 #define NOUVEAU_DSM_POWER 0x03
 #define NOUVEAU_DSM_POWER_STATE 0x00
 #define NOUVEAU_DSM_POWER_SPEED 0x01
 #define NOUVEAU_DSM_POWER_STAMINA 0x02
 #define NOUVEAU_DSM_OPTIMUS_CAPS 0x1A
 #define NOUVEAU_DSM_OPTIMUS_FLAGS 0x1B
 @@ -246,27 +253,31 @@ static bool nouveau_pr3_present(struct p
 	return parent_adev->power.flags.power_resources &&
 		acpi_has_method(parent_adev->handle, "_PR3");
+}
 static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_out,
 				  bool *has_mux, bool *has_opt,
 				  bool *has_opt_flags, bool *has_pr3)
+{
 	acpi_handle dhandle;
 	bool supports_mux;
 	int optimus_funcs;
 #ifdef __NetBSD__
 	dhandle = pdev->pd_ad->ad_handle;
 #else
 	dhandle = ACPI_HANDLE(&pdev->dev);
 #endif
 	if (!dhandle)
 		return;
 	if (!acpi_has_method(dhandle, "_DSM"))
 		return;
 	supports_mux = acpi_check_dsm(dhandle, &nouveau_dsm_muid, 0x00000102,
 << NOUVEAU_DSM_POWER);
 	optimus_funcs = nouveau_dsm_get_optimus_functions(dhandle);
 	/* Does not look like a Nvidia device. */
 	if (!supports_mux && !optimus_funcs)
 		return;
 @@ -411,66 +422,82 @@ static int nouveau_rom_call(acpi_handle
 	status = acpi_evaluate_object(rom_handle, NULL, &rom_arg, &buffer);
 	if (ACPI_FAILURE(status)) {
 		pr_info("failed to evaluate ROM got %s\n",
 			acpi_format_exception(status));
 		return -ENODEV;
+	}
 	obj = (union acpi_object *)buffer.pointer;
 	len = min(len, (int)obj->buffer.length);
 	memcpy(bios+offset, obj->buffer.pointer, len);
 	ACPI_FREE(buffer.pointer);
 	return len;
+}
 #ifdef __NetBSD__
 bool nouveau_acpi_rom_supported(struct acpi_devnode *acpidev)
 #else
 bool nouveau_acpi_rom_supported(struct device *dev)
 #endif
+{
 	acpi_status status;
 	acpi_handle dhandle, rom_handle;
 #ifdef __NetBSD__
 	dhandle = (acpidev ? acpidev->ad_handle : NULL);
 #else
 	dhandle = ACPI_HANDLE(dev);
 #endif
 	if (!dhandle)
 		return false;
 	status = acpi_get_handle(dhandle, "_ROM", &rom_handle);
 	if (ACPI_FAILURE(status))
 		return false;
 	nouveau_dsm_priv.rom_handle = rom_handle;
 	return true;
+}
 int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len)
+{
 	return nouveau_rom_call(nouveau_dsm_priv.rom_handle, bios, offset, len);
+}
 void *
 nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
+{
 #ifdef __NetBSD__		/* XXX nouveau acpi video */
 	return NULL;
 #else
 	struct acpi_device *acpidev;
 	acpi_handle handle;
 	int type, ret;
 	void *edid;
 	switch (connector->connector_type) {
 	case DRM_MODE_CONNECTOR_LVDS:
 	case DRM_MODE_CONNECTOR_eDP:
 		type = ACPI_VIDEO_DISPLAY_LCD;
 		break;
 	default:
 		return NULL;
+	}
 #ifdef __NetBSD__
 	handle = (dev->pdev->pd_ad ? dev->pdev->pd_ad->ad_handle : NULL);
 #else
 	handle = ACPI_HANDLE(&dev->pdev->dev);
 #endif
 	if (!handle)
 		return NULL;
 	ret = acpi_bus_get_device(handle, &acpidev);
 	if (ret)
 		return NULL;
 	ret = acpi_video_get_edid(acpidev, type, -1, &edid);
 	if (ret < 0)
 		return NULL;
 	return kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
 #endif
+}

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drv.h 2022/05/21 17:50:21	1.4
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drv.h 2024/04/16 14:34:02	1.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nouveau_drv.h,v 1.4 2022/05/21 17:50:21 riastradh Exp $	*/
+/*	$NetBSD: nouveau_drv.h,v 1.5 2024/04/16 14:34:02 riastradh Exp $	*/
 /* SPDX-License-Identifier: MIT */
 #ifndef __NOUVEAU_DRV_H__
 #define __NOUVEAU_DRV_H__
 #define DRIVER_AUTHOR		"Nouveau Project"
 #define DRIVER_EMAIL		"nouveau@lists.freedesktop.org"
 #define DRIVER_NAME		"nouveau"
 #define DRIVER_DESC		"nVidia Riva/TNT/GeForce/Quadro/Tesla/Tegra K1+"
 #define DRIVER_DATE		"20120801"
 #define DRIVER_MAJOR		1
 @@ -30,26 +30,27 @@
  * 	- object api exposed to userspace
  * 	- fermi,kepler,maxwell zbc
  * 1.2.1:
  *      - allow concurrent access to bo's mapped read/write.
  * 1.2.2:
  *      - add NOUVEAU_GEM_DOMAIN_COHERENT flag
  * 1.3.0:
  *      - NVIF ABI modified, safe because only (current) users are test
  *        programs that get directly linked with NVKM.
  * 1.3.1:
  *      - implemented limited ABI16/NVIF interop
  */
 #include <linux/acpi.h>
 #include <linux/notifier.h>
 #include <nvif/client.h>
 #include <nvif/device.h>
 #include <nvif/ioctl.h>
 #include <nvif/mmu.h>
 #include <nvif/vmm.h>
 #include <drm/drm_connector.h>
 #include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.h 2021/12/18 23:45:32	1.3
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.h 2024/04/16 14:34:02	1.4

 @@ -1,29 +1,39 @@
-/*	$NetBSD: nouveau_acpi.h,v 1.3 2021/12/18 23:45:32 riastradh Exp $	*/
+/*	$NetBSD: nouveau_acpi.h,v 1.4 2024/04/16 14:34:02 riastradh Exp $	*/
 /* SPDX-License-Identifier: MIT */
 #ifndef __NOUVEAU_ACPI_H__
 #define __NOUVEAU_ACPI_H__
 #include <linux/acpi.h>
 #define ROM_BIOS_PAGE 4096
 #if defined(CONFIG_ACPI) && defined(CONFIG_X86)
 bool nouveau_is_optimus(void);
 bool nouveau_is_v1_dsm(void);
 void nouveau_register_dsm_handler(void);
 void nouveau_unregister_dsm_handler(void);
 void nouveau_switcheroo_optimus_dsm(void);
 int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
 #ifdef __NetBSD__
 bool nouveau_acpi_rom_supported(struct acpi_devnode *);
 #else
 bool nouveau_acpi_rom_supported(struct device *);
 #endif
 void *nouveau_acpi_edid(struct drm_device *, struct drm_connector *);
 #else
 static inline bool nouveau_is_optimus(void) { return false; };
 static inline bool nouveau_is_v1_dsm(void) { return false; };
 static inline void nouveau_register_dsm_handler(void) {}
 static inline void nouveau_unregister_dsm_handler(void) {}
 static inline void nouveau_switcheroo_optimus_dsm(void) {}
 #ifdef __NetBSD__
 static inline bool nouveau_acpi_rom_supported(struct acpi_devnode *acpidev) { return false; }
 #else
 static inline bool nouveau_acpi_rom_supported(struct device *dev) { return false; }
 #endif
 static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; }
 static inline void *nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return NULL; }
 #endif
 #endif

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c 2021/12/18 23:45:32	1.5
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c 2024/04/16 14:34:02	1.6

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nouveau_display.c,v 1.5 2021/12/18 23:45:32 riastradh Exp $	*/
+/*	$NetBSD: nouveau_display.c,v 1.6 2024/04/16 14:34:02 riastradh Exp $	*/
 /*
  * Copyright (C) 2008 Maarten Maathuis.
  * All Rights Reserved.
+ *
  * 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,48 +17,53 @@
  * 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 COPYRIGHT OWNER(S) 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: nouveau_display.c,v 1.5 2021/12/18 23:45:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_display.c,v 1.6 2024/04/16 14:34:02 riastradh Exp $");
 #include <acpi/video.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_vblank.h>
 #include "nouveau_fbcon.h"
 #include "nouveau_crtc.h"
 #include "nouveau_gem.h"
 #include "nouveau_connector.h"
 #include "nv50_display.h"
 #include <nvif/class.h>
 #include <nvif/cl0046.h>
 #include <nvif/event.h>
 #ifdef __NetBSD__
 /* Used only for runtime power management, not in NetBSD for now.  */
 #undef	CONFIG_ACPI
 #endif
 static int
 nouveau_display_vblank_handler(struct nvif_notify *notify)
+{
 	struct nouveau_crtc *nv_crtc =
 		container_of(notify, typeof(*nv_crtc), vblank);
 	drm_crtc_handle_vblank(&nv_crtc->base);
 	return NVIF_NOTIFY_KEEP;
+}
 int
 nouveau_display_vblank_enable(struct drm_device *dev, unsigned int pipe)
+{
 	struct drm_crtc *crtc;

--- src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h 2021/12/18 23:45:33	1.9
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h 2024/04/16 14:34:02	1.10

 @@ -1,14 +1,14 @@
-/*	$NetBSD: device.h,v 1.9 2021/12/18 23:45:33 riastradh Exp $	*/
+/*	$NetBSD: device.h,v 1.10 2024/04/16 14:34:02 riastradh Exp $	*/
 /* SPDX-License-Identifier: MIT */
 #ifndef __NVKM_DEVICE_H__
 #define __NVKM_DEVICE_H__
 #include <core/oclass.h>
 #include <core/event.h>
 enum nvkm_devidx {
 	NVKM_SUBDEV_PCI,
 	NVKM_SUBDEV_VBIOS,
 	NVKM_SUBDEV_DEVINIT,
 	NVKM_SUBDEV_TOP,
 	NVKM_SUBDEV_IBUS,
 @@ -82,26 +82,29 @@ enum nvkm_devidx {
 enum nvkm_device_type {
 	NVKM_DEVICE_PCI,
 	NVKM_DEVICE_AGP,
 	NVKM_DEVICE_PCIE,
 	NVKM_DEVICE_TEGRA,
 };
 struct nvkm_device {
 	const struct nvkm_device_func *func;
 	const struct nvkm_device_quirk *quirk;
 	struct device *dev;
 	enum nvkm_device_type type;
 	u64 handle;
 #ifdef __NetBSD__
 	struct acpi_devnode *acpidev;
 #endif
 	const char *name;
 	const char *cfgopt;
 	const char *dbgopt;
 	struct list_head head;
 	struct mutex mutex;
 	int refcount;
 #ifdef __NetBSD__
 	bus_space_tag_t mmiot;
 	bus_space_handle_t mmioh;
 	bus_addr_t mmioaddr;
 	bus_size_t mmiosz;

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_acpi.c 2021/12/18 23:45:34	1.3
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_acpi.c 2024/04/16 14:34:02	1.4

 @@ -1,45 +1,50 @@
-/*	$NetBSD: nouveau_nvkm_engine_device_acpi.c,v 1.3 2021/12/18 23:45:34 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_engine_device_acpi.c,v 1.4 2024/04/16 14:34:02 riastradh Exp $	*/
 /*
  * Copyright 2014 Red Hat 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:
+ *
  * The above copyright notice and this permission notice 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 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: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_acpi.c,v 1.3 2021/12/18 23:45:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_acpi.c,v 1.4 2024/04/16 14:34:02 riastradh Exp $");
 #include "acpi.h"
 #include <core/device.h>
 #ifdef __NetBSD__
 /* This should be a PMF hook, not an ACPI notifier.  */
 #undef	CONFIG_ACPI
 #endif
 #ifdef CONFIG_ACPI
 static int
 nvkm_acpi_ntfy(struct notifier_block *nb, unsigned long val, void *data)
+{
 	struct nvkm_device *device =
 		container_of(nb, typeof(*device), acpi.nb);
 	struct acpi_bus_event *info = data;
 	if (!strcmp(info->device_class, "ac_adapter"))
 		nvkm_event_send(&device->event, 1, 0, NULL, 0);
 	return NOTIFY_DONE;
+}

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_tegra.c 2021/12/18 23:45:34	1.3
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_tegra.c 2024/04/16 14:34:02	1.4

 @@ -1,38 +1,38 @@
-/*	$NetBSD: nouveau_nvkm_engine_device_tegra.c,v 1.3 2021/12/18 23:45:34 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_engine_device_tegra.c,v 1.4 2024/04/16 14:34:02 riastradh Exp $	*/
 /*
  * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ *
  * 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
  * 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: nouveau_nvkm_engine_device_tegra.c,v 1.3 2021/12/18 23:45:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_tegra.c,v 1.4 2024/04/16 14:34:02 riastradh Exp $");
 #include <core/tegra.h>
 #ifdef CONFIG_NOUVEAU_PLATFORM_DRIVER
 #include "priv.h"
 #if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)
 #include <asm/dma-iommu.h>
 #endif
 static int
 nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev)
+{
 	int ret;
 @@ -354,27 +354,31 @@ nvkm_device_tegra_new(const struct nvkm_
 	ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(tdev->func->iommu_bit));
 	if (ret)
 		goto free;
 	nvkm_device_tegra_probe_iommu(tdev);
 	ret = nvkm_device_tegra_power_up(tdev);
 	if (ret)
 		goto remove;
 	tdev->gpu_speedo = tegra_sku_info.gpu_speedo_value;
 	tdev->gpu_speedo_id = tegra_sku_info.gpu_speedo_id;
 	ret = nvkm_device_ctor(&nvkm_device_tegra_func, NULL, &pdev->dev,
-			       NVKM_DEVICE_TEGRA, pdev->id, NULL,
+			       NVKM_DEVICE_TEGRA, pdev->id,
 #ifdef __NetBSD__
 			       /*acpidev*/NULL,
 #endif
 			       /*name*/NULL,
 			       cfg, dbg, detect, mmio, subdev_mask,
 			       &tdev->device);
 	if (ret)
 		goto powerdown;
 	*pdevice = &tdev->device;
 	return 0;
 powerdown:
 	nvkm_device_tegra_power_down(tdev);
 remove:
 	nvkm_device_tegra_remove_iommu(tdev);

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/priv.h 2021/12/18 23:45:34	1.3
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/priv.h 2024/04/16 14:34:02	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: priv.h,v 1.3 2021/12/18 23:45:34 riastradh Exp $	*/
+/*	$NetBSD: priv.h,v 1.4 2024/04/16 14:34:02 riastradh Exp $	*/
 /* SPDX-License-Identifier: MIT */
 #ifndef __NVKM_DEVICE_PRIV_H__
 #define __NVKM_DEVICE_PRIV_H__
 #include <core/device.h>
 #include <subdev/acr.h>
 #include <subdev/bar.h>
 #include <subdev/bios.h>
 #include <subdev/bus.h>
 #include <subdev/clk.h>
 #include <subdev/devinit.h>
 #include <subdev/fault.h>
 @@ -44,19 +44,22 @@
 #include <engine/msvld.h>
 #include <engine/nvenc.h>
 #include <engine/nvdec.h>
 #include <engine/pm.h>
 #include <engine/sec.h>
 #include <engine/sec2.h>
 #include <engine/sw.h>
 #include <engine/vic.h>
 #include <engine/vp.h>
 int  nvkm_device_ctor(const struct nvkm_device_func *,
 		      const struct nvkm_device_quirk *,
 		      struct device *, enum nvkm_device_type, u64 handle,
 #ifdef __NetBSD__		/* XXX nouveau acpi */
 		      struct acpi_devnode *acpidev,
 #endif
 		      const char *name, const char *cfg, const char *dbg,
 		      bool detect, bool mmio, u64 subdev_mask,
 		      struct nvkm_device *);
 int  nvkm_device_init(struct nvkm_device *);
 int  nvkm_device_fini(struct nvkm_device *, bool suspend);
 #endif

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c 2021/12/19 10:50:22	1.12
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c 2024/04/16 14:34:02	1.13

 @@ -1,40 +1,40 @@
-/*	$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.12 2021/12/19 10:50:22 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.13 2024/04/16 14:34:02 riastradh Exp $	*/
 /*
  * Copyright 2012 Red Hat 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:
+ *
  * The above copyright notice and this permission notice 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 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: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.12 2021/12/19 10:50:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.13 2024/04/16 14:34:02 riastradh Exp $");
 #include "priv.h"
 #include "acpi.h"
 #include <core/notify.h>
 #include <core/option.h>
 #include <subdev/bios.h>
 #include <subdev/therm.h>
 #ifdef __NetBSD__
 #include <linux/nbsd-namespace.h>
 static struct mutex nv_devices_mutex;
 @@ -2951,51 +2951,57 @@ nvkm_device_del(struct nvkm_device **pde
 		if (device->func->dtor)
 			*pdevice = device->func->dtor(device);
 		mutex_unlock(&nv_devices_mutex);
 		kfree(*pdevice);
 		*pdevice = NULL;
+	}
+}
 int
 nvkm_device_ctor(const struct nvkm_device_func *func,
 		 const struct nvkm_device_quirk *quirk,
 		 struct device *dev, enum nvkm_device_type type, u64 handle,
 #ifdef __NetBSD__		/* XXX nouveau acpi */
 		 struct acpi_devnode *acpidev,
 #endif
 		 const char *name, const char *cfg, const char *dbg,
 		 bool detect, bool mmio, u64 subdev_mask,
 		 struct nvkm_device *device)
+{
 	struct nvkm_subdev *subdev;
 	u64 mmio_base, mmio_size;
 	u32 boot0, strap;
 #ifdef __NetBSD__
 	bus_space_tag_t mmiot;
 	bus_space_handle_t mmioh;
 #else
 	void __iomem *map;
 #endif
 	int ret = -EEXIST, i;
 	unsigned chipset;
 	mutex_lock(&nv_devices_mutex);
 	if (nvkm_device_find_locked(handle))
 		goto done;
 	device->func = func;
 	device->quirk = quirk;
 	device->dev = dev;
 	device->type = type;
 	device->handle = handle;
 #ifdef __NetBSD__		/* XXX nouveau acpi */
 	device->acpidev = acpidev;
 #endif
 	device->cfgopt = cfg;
 	device->dbgopt = dbg;
 	device->name = name;
 	list_add_tail(&device->head, &nv_devices);
 	device->debug = nvkm_dbgopt(device->dbgopt, "device");
 	ret = nvkm_event_init(&nvkm_device_event_func, 1, 1, &device->event);
 	if (ret)
 		goto done;
 #ifdef __NetBSD__
 	mmiot = device->func->resource_tag(device, 0);
 #endif

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c 2021/12/19 10:51:57	1.11
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c 2024/04/16 14:34:02	1.12

 @@ -1,40 +1,40 @@
-/*	$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.11 2021/12/19 10:51:57 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.12 2024/04/16 14:34:02 riastradh Exp $	*/
 /*
  * Copyright 2015 Red Hat 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:
+ *
  * The above copyright notice and this permission notice 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 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: Ben Skeggs <bskeggs@redhat.com>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.11 2021/12/19 10:51:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_pci.c,v 1.12 2024/04/16 14:34:02 riastradh Exp $");
 #include <core/pci.h>
 #include "priv.h"
 struct nvkm_device_pci_device {
 	u16 device;
 	const char *name;
 	const struct nvkm_device_pci_vendor *vendor;
 };
 struct nvkm_device_pci_vendor {
 	u16 vendor;
 	u16 device;
 @@ -1711,27 +1711,31 @@ nvkm_device_pci_new(struct pci_dev *pci_
 		return -ENOMEM;
+	}
 	*pdevice = &pdev->device;
 	pdev->pdev = pci_dev;
 	ret = nvkm_device_ctor(&nvkm_device_pci_func, quirk,
 			       pci_dev_dev(pci_dev),
 			       pci_is_pcie(pci_dev) ? NVKM_DEVICE_PCIE :
 			       pci_find_capability(pci_dev, PCI_CAP_ID_AGP) ?
 			       NVKM_DEVICE_AGP : NVKM_DEVICE_PCI,
 			       (u64)pci_domain_nr(pci_dev->bus) << 32 |
 				    pci_dev->bus->number << 16 |
 				    PCI_SLOT(pci_dev->devfn) << 8 |
-				    PCI_FUNC(pci_dev->devfn), name,
+				    PCI_FUNC(pci_dev->devfn),
 #ifdef __NetBSD__
 			       /*acpidev*/pci_dev->pd_ad,
 #endif
 			       name,
 			       cfg, dbg, detect, mmio, subdev_mask,
 			       &pdev->device);
 	if (ret)
 		return ret;
 	/* Set DMA mask based on capabilities reported by the MMU subdev. */
 	if (pdev->device.mmu && !pdev->device.pci->agp.bridge)
 		bits = pdev->device.mmu->dma_bits;
 	else
 		bits = 32;
 #ifdef __NetBSD__

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowacpi.c 2021/12/18 23:45:38	1.3
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowacpi.c 2024/04/16 14:34:02	1.4

 @@ -1,48 +1,56 @@
-/*	$NetBSD: nouveau_nvkm_subdev_bios_shadowacpi.c,v 1.3 2021/12/18 23:45:38 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_subdev_bios_shadowacpi.c,v 1.4 2024/04/16 14:34:02 riastradh Exp $	*/
 /*
  * Copyright 2012 Red Hat 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:
+ *
  * The above copyright notice and this permission notice 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 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_bios_shadowacpi.c,v 1.3 2021/12/18 23:45:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_bios_shadowacpi.c,v 1.4 2024/04/16 14:34:02 riastradh Exp $");
 #include "priv.h"
 #if defined(CONFIG_ACPI) && defined(CONFIG_X86)
 int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
 #ifdef __NetBSD__
 bool nouveau_acpi_rom_supported(struct acpi_devnode *);
 #else
 bool nouveau_acpi_rom_supported(struct device *);
 #endif
 #else
 static inline bool
 #ifdef __NetBSD__
 nouveau_acpi_rom_supported(struct acpi_devnode *dev)
 #else
 nouveau_acpi_rom_supported(struct device *dev)
 #endif
+{
 	return false;
+}
 static inline int
 nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len)
+{
 	return -EINVAL;
+}
 #endif
 /* This version of the shadow function disobeys the ACPI spec and tries
  * to fetch in units of more than 4KiB at a time.  This is a LOT faster
 @@ -83,27 +91,27 @@ acpi_read_slow(void *data, u32 offset, u
 x1000);
 			if (ret != 0x1000)
 				break;
 			fetch += 0x1000;
+		}
+	}
 	return fetch;
+}
 static void *
 acpi_init(struct nvkm_bios *bios, const char *name)
+{
-	if (!nouveau_acpi_rom_supported(bios->subdev.device->dev))
+	if (!nouveau_acpi_rom_supported(bios->subdev.device->acpidev))
 		return ERR_PTR(-ENODEV);
 	return NULL;
+}
 const struct nvbios_source
 nvbios_acpi_fast = {
 	.name = "ACPI",
 	.init = acpi_init,
 	.read = acpi_read_fast,
 	.rw = false,
 	.require_checksum = true,
 };

--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c 2022/02/27 14:24:27	1.4
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c 2024/04/16 14:34:02	1.5

 @@ -1,48 +1,57 @@
-/*	$NetBSD: nouveau_nvkm_subdev_mxm_base.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $	*/
+/*	$NetBSD: nouveau_nvkm_subdev_mxm_base.c,v 1.5 2024/04/16 14:34:02 riastradh Exp $	*/
 /*
  * Copyright 2011 Red Hat 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:
+ *
  * The above copyright notice and this permission notice 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 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: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mxm_base.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_subdev_mxm_base.c,v 1.5 2024/04/16 14:34:02 riastradh Exp $");
 #include "mxms.h"
 #include <core/option.h>
 #include <subdev/bios.h>
 #include <subdev/bios/mxm.h>
 #include <subdev/i2c.h>
 #ifdef __NetBSD__
 #ifdef CONFIG_ACPI
 #include <dev/acpi/acpireg.h>
 #define	_COMPONENT	ACPI_DISPLAY_COMPONENT
 ACPI_MODULE_NAME("nouveau_nvkm_subdev_mxm_base")
 #include <linux/nbsd-namespace-acpi.h>
 #endif
 #endif
 static bool
 mxm_shadow_rom_fetch(struct nvkm_i2c_bus *bus, u8 addr,
 		     u8 offset, u8 size, u8 *data)
+{
 	struct i2c_msg msgs[] = {
 		{ .addr = addr, .flags = 0, .len = 1, .buf = &offset },
 		{ .addr = addr, .flags = I2C_M_RD, .len = size, .buf = data, },
 	};
 	return i2c_transfer(&bus->i2c, msgs, 2) == 2;
+}
 static bool
 @@ -89,27 +98,31 @@ mxm_shadow_dsm(struct nvkm_mxm *mxm, u8
 	static guid_t muid =
 		GUID_INIT(0x4004A400, 0x917D, 0x4CF2,
 xB8, 0x9C, 0x79, 0xB6, 0x2F, 0xD5, 0x56, 0x65);
 	u32 mxms_args[] = { 0x00000000 };
 	union acpi_object argv4 = {
 		.buffer.type = ACPI_TYPE_BUFFER,
 		.buffer.length = sizeof(mxms_args),
 		.buffer.pointer = (char *)mxms_args,
 	};
 	union acpi_object *obj;
 	acpi_handle handle;
 	int rev;
 #ifdef __NetBSD__
 	handle = (device->acpidev ? device->acpidev->ad_handle : NULL);
 #else
 	handle = ACPI_HANDLE(device->dev);
 #endif
 	if (!handle)
 		return false;
 	/*
 	 * spec says this can be zero to mean "highest revision", but
 	 * of course there's at least one bios out there which fails
 	 * unless you pass in exactly the version it supports..
 	 */
 	rev = (version & 0xf0) << 4 | (version & 0x0f);
 	obj = acpi_evaluate_dsm(handle, &muid, rev, 0x00000010, &argv4);
 	if (!obj) {
 		nvkm_debug(subdev, "DSM MXMS failed\n");
 		return false;

--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h 2021/12/19 11:52:38	1.11
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h 2024/04/16 14:34:02	1.12

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeon.h,v 1.11 2021/12/19 11:52:38 riastradh Exp $	*/
+/*	$NetBSD: radeon.h,v 1.12 2024/04/16 14:34:02 riastradh 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:
+ *
 @@ -59,26 +59,27 @@
  *                          follow guideline the first thing this
  *                          function should do is setting the GPU
  *                          memory controller (only MC setup failure
  *                          are considered as fatal)
  */
 #include <linux/atomic.h>
 #include <linux/wait.h>
 #include <linux/list.h>
 #include <linux/kref.h>
 #include <linux/interval_tree.h>
 #include <linux/hashtable.h>
 #include <linux/dma-fence.h>
 #include <linux/acpi.h>
 #ifdef CONFIG_MMU_NOTIFIER
 #include <linux/mmu_notifier.h>
 #endif
 #include <drm/ttm/ttm_bo_api.h>
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
 #include <drm/ttm/ttm_module.h>
 #include <drm/ttm/ttm_execbuf_util.h>
 #include <drm/drm_gem.h>

--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c 2022/02/27 14:24:27	1.4
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c 2024/04/16 14:34:02	1.5

 @@ -1,57 +1,65 @@
-/*	$NetBSD: radeon_acpi.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $	*/
+/*	$NetBSD: radeon_acpi.c,v 1.5 2024/04/16 14:34:02 riastradh Exp $	*/
 /*
  * Copyright 2012 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:
+ *
  * The above copyright notice and this permission notice 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 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.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_acpi.c,v 1.4 2022/02/27 14:24:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_acpi.c,v 1.5 2024/04/16 14:34:02 riastradh Exp $");
 #include <linux/acpi.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/power_supply.h>
 #include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/video.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_probe_helper.h>
 #include "atom.h"
 #include "radeon.h"
 #include "radeon_acpi.h"
 #ifdef __NetBSD__
 #include <dev/acpi/acpi_pci.h>
 #include <dev/acpi/acpireg.h>
 #define	_COMPONENT	ACPI_DISPLAY_COMPONENT
 ACPI_MODULE_NAME("radeon_acpi")
 #include <linux/nbsd-namespace-acpi.h>
 #endif
 #if defined(CONFIG_VGA_SWITCHEROO)
 bool radeon_atpx_dgpu_req_power_for_displays(void);
 #else
 static inline bool radeon_atpx_dgpu_req_power_for_displays(void) { return false; }
 #endif
 #define ACPI_AC_CLASS           "ac_adapter"
 extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev);
 struct atif_verify_interface {
 	u16 size;		/* structure size in bytes (includes size field) */
 	u16 version;		/* version */
 @@ -300,26 +308,28 @@ static int radeon_atif_get_notification_
+		}
 		n->enabled = true;
 		n->command_code = params.command_code;
+	}
 out:
 	DRM_DEBUG_DRIVER("Notification %s, command code = %#x\n",
 			(n->enabled ? "enabled" : "disabled"),
 			n->command_code);
 	ACPI_FREE(info);
 	return err;
+}
 #ifndef __NetBSD__		/* XXX radeon acpi */
 /**
  * radeon_atif_get_sbios_requests - get requested sbios event
+ *
  * @handle: acpi handle
  * @req: atif sbios request struct
+ *
  * Execute the ATIF_FUNCTION_GET_SYSTEM_BIOS_REQUESTS ATIF function
  * to determine what requests the sbios is making to the driver
  * (all asics).
  * Returns 0 on success, error on failure.
  */
 static int radeon_atif_get_sbios_requests(acpi_handle handle,
 		struct atif_sbios_requests *req)
 @@ -420,26 +430,28 @@ static int radeon_atif_handler(struct ra
 			pm_runtime_put_autosuspend(rdev->ddev->dev);
+		}
+	}
 	/* TODO: check other events */
 	/* We've handled the event, stop the notifier chain. The ACPI interface
 	 * overloads ACPI_VIDEO_NOTIFY_PROBE, we don't want to send that to
 	 * userspace if the event was generated only to signal a SBIOS
 	 * request.
 	 */
 	return NOTIFY_BAD;
+}
 #endif	/* __NetBSD__ */
 /* Call the ATCS method
  */
 /**
  * radeon_atcs_call - call an ATCS method
+ *
  * @handle: acpi handle
  * @function: the ATCS function to execute
  * @params: ATCS function params
+ *
  * Executes the requested ATCS function (all asics).
  * Returns a pointer to the acpi output buffer.
  */
 static union acpi_object *radeon_atcs_call(acpi_handle handle, int function,
 @@ -567,27 +579,37 @@ bool radeon_acpi_is_pcie_performance_req
  * @rdev: radeon_device pointer
+ *
  * Executes the PCIE_DEVICE_READY_NOTIFICATION method
  * (all asics).
  * returns 0 on success, error on failure.
  */
 int radeon_acpi_pcie_notify_device_ready(struct radeon_device *rdev)
+{
 	acpi_handle handle;
 	union acpi_object *info;
 	struct radeon_atcs *atcs = &rdev->atcs;
 	/* Get the device handle */
 #ifdef __NetBSD__
 	const struct pci_attach_args *pa = &rdev->pdev->pd_pa;
 	struct acpi_devnode *const d =
 	    acpi_pcidev_find(pci_get_segment(pa->pa_pc),
 		pa->pa_bus, pa->pa_device, pa->pa_function);
 	if (d == NULL)
 		return -EINVAL;
 	handle = d->ad_handle;
 #else
 	handle = ACPI_HANDLE(&rdev->pdev->dev);
 #endif
 	if (!handle)
 		return -EINVAL;
 	if (!atcs->functions.pcie_dev_rdy)
 		return -EINVAL;
 	info = radeon_atcs_call(handle, ATCS_FUNCTION_PCIE_DEVICE_READY_NOTIFICATION, NULL);
 	if (!info)
 		return -EIO;
 	ACPI_FREE(info);
 	return 0;
 @@ -607,27 +629,37 @@ int radeon_acpi_pcie_notify_device_ready
 int radeon_acpi_pcie_performance_request(struct radeon_device *rdev,
 					 u8 perf_req, bool advertise)
+{
 	acpi_handle handle;
 	union acpi_object *info;
 	struct radeon_atcs *atcs = &rdev->atcs;
 	struct atcs_pref_req_input atcs_input;
 	struct atcs_pref_req_output atcs_output;
 	struct acpi_buffer params;
 	size_t size;
 	u32 retry = 3;
 	/* Get the device handle */
 #ifdef __NetBSD__
 	const struct pci_attach_args *pa = &rdev->pdev->pd_pa;
 	struct acpi_devnode *const d =
 	    acpi_pcidev_find(pci_get_segment(pa->pa_pc),
 		pa->pa_bus, pa->pa_device, pa->pa_function);
 	if (d == NULL)
 		return -EINVAL;
 	handle = d->ad_handle;
 #else
 	handle = ACPI_HANDLE(&rdev->pdev->dev);
 #endif
 	if (!handle)
 		return -EINVAL;
 	if (!atcs->functions.pcie_perf_req)
 		return -EINVAL;
 	atcs_input.size = sizeof(struct atcs_pref_req_input);
 	/* client id (bit 2-0: func num, 7-3: dev num, 15-8: bus num) */
 	atcs_input.client_id = rdev->pdev->devfn | (rdev->pdev->bus->number << 8);
 	atcs_input.valid_flags_mask = ATCS_VALID_FLAGS_MASK;
 	atcs_input.flags = ATCS_WAIT_FOR_COMPLETION;
 	if (advertise)
 		atcs_input.flags |= ATCS_ADVERTISE_CAPS;
 @@ -672,65 +704,77 @@ int radeon_acpi_pcie_performance_request
+}
 /**
  * radeon_acpi_event - handle notify events
+ *
  * @nb: notifier block
  * @val: val
  * @data: acpi event
+ *
  * Calls relevant radeon functions in response to various
  * acpi events.
  * Returns NOTIFY code
  */
 #ifndef __NetBSD__		/* XXX radeon acpi */
 static int radeon_acpi_event(struct notifier_block *nb,
 			     unsigned long val,
 			     void *data)
+{
 	struct radeon_device *rdev = container_of(nb, struct radeon_device, acpi_nb);
 	struct acpi_bus_event *entry = (struct acpi_bus_event *)data;
 	if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
 		if (power_supply_is_system_supplied() > 0)
 			DRM_DEBUG_DRIVER("pm: AC\n");
 		else
 			DRM_DEBUG_DRIVER("pm: DC\n");
 		radeon_pm_acpi_event_handler(rdev);
+	}
 	/* Check for pending SBIOS requests */
 	return radeon_atif_handler(rdev, entry);
+}
 #endif
 /* Call all ACPI methods here */
 /**
  * radeon_acpi_init - init driver acpi support
+ *
  * @rdev: radeon_device pointer
+ *
  * Verifies the AMD ACPI interfaces and registers with the acpi
  * notifier chain (all asics).
  * Returns 0 on success, error on failure.
  */
 int radeon_acpi_init(struct radeon_device *rdev)
+{
 	acpi_handle handle;
 	struct radeon_atif *atif = &rdev->atif;
 	struct radeon_atcs *atcs = &rdev->atcs;
 	int ret;
 	/* Get the device handle */
 #ifdef __NetBSD__
 	const struct pci_attach_args *pa = &rdev->pdev->pd_pa;
 	struct acpi_devnode *const d =
 	    acpi_pcidev_find(pci_get_segment(pa->pa_pc),
 		pa->pa_bus, pa->pa_device, pa->pa_function);
 	if (d == NULL)
 		return -EINVAL;
 	handle = d->ad_handle;
 #else
 	handle = ACPI_HANDLE(&rdev->pdev->dev);
 #endif
 	/* No need to proceed if we're sure that ATIF is not supported */
 	if (!ASIC_IS_AVIVO(rdev) || !rdev->bios || !handle)
 		return 0;
 	/* Call the ATCS method */
 	ret = radeon_atcs_verify_interface(handle, atcs);
 	if (ret) {
 		DRM_DEBUG_DRIVER("Call to ATCS verify_interface failed: %d\n", ret);
+	}
 	/* Call the ATIF method */
 	ret = radeon_atif_verify_interface(handle, atif);
 @@ -779,30 +823,34 @@ int radeon_acpi_init(struct radeon_devic
 	if (atif->functions.system_params) {
 		ret = radeon_atif_get_notification_params(handle,
 				&atif->notification_cfg);
 		if (ret) {
 			DRM_DEBUG_DRIVER("Call to GET_SYSTEM_PARAMS failed: %d\n",
 					ret);
 			/* Disable notification */
 			atif->notification_cfg.enabled = false;
+		}
+	}
 out:
 #ifndef __NetBSD__		/* XXX radeon acpi */
 	rdev->acpi_nb.notifier_call = radeon_acpi_event;
 	register_acpi_notifier(&rdev->acpi_nb);
 #endif
 	return ret;
+}
 /**
  * radeon_acpi_fini - tear down driver acpi support
+ *
  * @rdev: radeon_device pointer
+ *
  * Unregisters with the acpi notifier chain (all asics).
  */
 void radeon_acpi_fini(struct radeon_device *rdev)
+{
 #ifndef __NetBSD__		/* XXX radeon acpi */
 	unregister_acpi_notifier(&rdev->acpi_nb);
 #endif
+}

--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h 2022/05/28 01:07:47	1.4
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h 2024/04/16 14:34:02	1.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeon_drv.h,v 1.4 2022/05/28 01:07:47 manu Exp $	*/
+/*	$NetBSD: radeon_drv.h,v 1.5 2024/04/16 14:34:02 riastradh Exp $	*/
 /* radeon_drv.h -- Private header for radeon driver -*- linux-c -*-
+ *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
  * All rights reserved.
+ *
  * 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:
 @@ -23,35 +23,26 @@
  * 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.
+ *
  * Authors:
  *    Kevin E. Martin <martin@valinux.com>
  *    Gareth Hughes <gareth@valinux.com>
  */
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
 #if defined(__NetBSD__)
 #ifdef _KERNEL_OPT
 #include "acpica.h"
 #endif  /* _KERNEL_OPT */
 #if (NACPICA > 0)
 #define CONFIG_ACPI
 #endif  /* NACPICA > 0 */
 #endif  /* __NetBSD__ */
 #include <linux/firmware.h>
 #include <linux/platform_device.h>
 #include <drm/drm_legacy.h>
 #include "radeon_family.h"
 /* General customization:
  */
 #define DRIVER_AUTHOR		"Gareth Hughes, Keith Whitwell, others."
 #define DRIVER_NAME		"radeon"
 #define DRIVER_DESC		"ATI Radeon"

--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c 2023/11/06 14:33:51	1.13
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c 2024/04/16 14:34:02	1.14

 @@ -1,14 +1,14 @@
-/*	$NetBSD: radeon_bios.c,v 1.13 2023/11/06 14:33:51 tnn Exp $	*/
+/*	$NetBSD: radeon_bios.c,v 1.14 2024/04/16 14:34:02 riastradh 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:
+ *
 @@ -19,40 +19,39 @@
  * 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: radeon_bios.c,v 1.13 2023/11/06 14:33:51 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.14 2024/04/16 14:34:02 riastradh Exp $");
 #include <linux/acpi.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <drm/drm_device.h>
 #include "atom.h"
 #include "radeon.h"
 #include "radeon_reg.h"
-#if defined(__NetBSD__) && NACPICA > 0
+#if defined(__NetBSD__) && defined(CONFIG_ACPI)
 #define CONFIG_ACPI
 #include <dev/acpi/acpireg.h>
 #define	_COMPONENT	ACPI_DISPLAY_COMPONENT
 ACPI_MODULE_NAME("radeon_acpi")
 #include <linux/nbsd-namespace-acpi.h>
 #endif
 /*
  * BIOS.
  */
 /* If you boot an IGP board with a discrete card as the primary,
  * the IGP rom is not accessible via the rom bar as the IGP rom is
  * part of the system bios.  On boot, the system bios puts a

--- src/sys/external/bsd/drm2/include/acpi/video.h 2014/03/18 18:20:42	1.2
+++ src/sys/external/bsd/drm2/include/acpi/video.h 2024/04/16 14:34:03	1.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: video.h,v 1.2 2014/03/18 18:20:42 riastradh Exp $	*/
+/*	$NetBSD: video.h,v 1.3 2024/04/16 14:34:03 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,24 +22,26 @@
  * 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 _DRM2_COMPAT_ACPI_VIDEO_H_
 #define _DRM2_COMPAT_ACPI_VIDEO_H_
 #include <linux/acpi.h>
 static inline void
 acpi_video_register(void)
+{
+}
 static inline void
 acpi_video_unregister(void)
+{
+}
 #endif  /* _DRM2_COMPAT_ACPI_VIDEO_H_ */

--- src/sys/external/bsd/drm2/include/linux/acpi.h 2022/05/28 01:07:47	1.10
+++ src/sys/external/bsd/drm2/include/linux/acpi.h 2024/04/16 14:34:03	1.11

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi.h,v 1.10 2022/05/28 01:07:47 manu Exp $	*/
+/*	$NetBSD: acpi.h,v 1.11 2024/04/16 14:34:03 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.
 @@ -27,35 +27,39 @@
  * 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_ACPI_H_
 #define _LINUX_ACPI_H_
 #ifdef _KERNEL_OPT
 #include "acpica.h"
 #endif
 #if NACPICA > 0
 #define	CONFIG_ACPI	1
 #include <dev/acpi/acpivar.h>
 #include <linux/types.h>
 #include <linux/uuid.h>
 typedef ACPI_HANDLE acpi_handle;
 typedef ACPI_OBJECT_TYPE acpi_object_type;
 typedef ACPI_SIZE acpi_size;
 typedef ACPI_STATUS acpi_status;
 #define	acpi_evaluate_dsm	linux_acpi_evaluate_dsm
 #define	acpi_evaluate_dsm_typed	linux_acpi_evaluate_dsm_typed
 #define	acpi_check_dsm		linux_acpi_check_dsm
 union acpi_object *acpi_evaluate_dsm(acpi_handle, const guid_t *,
     uint64_t, uint64_t, union acpi_object *);
 union acpi_object *acpi_evaluate_dsm_typed(acpi_handle, const guid_t *,
     uint64_t, uint64_t, union acpi_object *, acpi_object_type);
 bool acpi_check_dsm(acpi_handle, const guid_t *, uint64_t, uint64_t);
 #endif	/* NACPICA > 0 */
 #endif  /* _LINUX_ACPI_H_ */

--- src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h 2022/02/27 14:22:42	1.1
+++ src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h 2024/04/16 14:34:03	1.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nbsd-namespace-acpi.h,v 1.1 2022/02/27 14:22:42 riastradh Exp $	*/
+/*	$NetBSD: nbsd-namespace-acpi.h,v 1.2 2024/04/16 14:34:03 riastradh Exp $	*/
 /*-
  * Copyright (c) 2022 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -30,18 +30,19 @@
 #define _LINUX_NBSD_NAMESPACE_ACPI_H_
 #define	buffer		Buffer
 #define	count		Count
 #define	elements	Elements
 #define	integer		Integer
 #define	length		Length
 #define	package		Package
 #define	pointer		Pointer
 #define	type		Type
 #define	value		Value
 #define	acpi_get_handle		AcpiGetHandle
 #define	acpi_get_name		AcpiGetName
 #define	acpi_get_table		AcpiGetTable
 #define	acpi_evaluate_object	AcpiEvaluateObject
 #define	acpi_format_exception	AcpiFormatException
 #endif  /* _LINUX_NBSD_NAMESPACE_ACPI_H_ */

--- src/sys/external/bsd/drm2/nouveau/files.nouveau 2023/06/03 21:30:22	1.39
+++ src/sys/external/bsd/drm2/nouveau/files.nouveau 2024/04/16 14:34:03	1.40

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.nouveau,v 1.39 2023/06/03 21:30:22 lukem Exp $
+#	$NetBSD: files.nouveau,v 1.40 2024/04/16 14:34:03 riastradh Exp $
 version	20180827
 define	nouveaufbbus	{ }
 device	nouveau: drmkms, drmkms_ttm, nouveaufbbus, firmload
 makeoptions	nouveau		"CPPFLAGS.nouveau"+="${CPPFLAGS.drmkms}"
 attach	nouveau at pci with nouveau_pci: drmkms_pci
 file	external/bsd/drm2/nouveau/nouveau_pci.c			nouveau_pci
 makeoptions	nouveau_pci	"CPPFLAGS.nouveau_pci"+="${CPPFLAGS.nouveau}"
 device	nouveaufb: nouveaufbbus, drmfb, drmfb_pci, wsemuldisplaydev
 attach	nouveaufb at nouveaufbbus
 @@ -89,26 +89,27 @@ file	external/bsd/drm2/dist/drm/nouveau/
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_ovly827e.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_ovly907e.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_ovly917e.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_pior507d.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_sor507d.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_sor907d.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_sorc37d.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_wimm.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_wimmc37b.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_wndw.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_wndwc37e.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_wndwc57e.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c	nouveau & acpi
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_bios.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_chan.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_connector.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_display.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_dma.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_dp.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_fence.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_gem.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_hwmon.c	nouveau
 file	external/bsd/drm2/dist/drm/nouveau/nouveau_mem.c	nouveau

--- src/sys/external/bsd/drm2/radeon/files.radeon 2023/06/03 21:31:47	1.39
+++ src/sys/external/bsd/drm2/radeon/files.radeon 2024/04/16 14:34:03	1.40

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.radeon,v 1.39 2023/06/03 21:31:47 lukem Exp $
+#	$NetBSD: files.radeon,v 1.40 2024/04/16 14:34:03 riastradh Exp $
 version	20180827
 define	radeonfbbus	{ }
 device	radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus, firmload
 attach	radeon at pci
 # XXX Rename this to radeonfb when the legacy radeonfb(4) is gone.
 device	radeondrmkmsfb: radeonfbbus, drmfb, drmfb_pci, wsemuldisplaydev
 attach	radeondrmkmsfb at radeonfbbus
 # This code comes from the Linux kernel, which assumes signed
 # overflow is OK.
 @@ -38,27 +38,27 @@ makeoptions	radeon	"CWARNFLAGS.radeon"+=
 #makeoptions 	radeon 	"CWARNFLAGS.radeon_cs.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
 makeoptions 	radeon 	"CWARNFLAGS.radeon_evergreen_cs.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
 makeoptions 	radeon 	"CWARNFLAGS.radeon_r300.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
 makeoptions 	radeon 	"CWARNFLAGS.radeon_r420.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
 makeoptions	radeon	"CWARNFLAGS.radeon_uvd.c"+="${${ACTIVE_CC} == clang:? -Wno-format :}"
 file	external/bsd/drm2/radeon/radeon_module.c		radeon
 file	external/bsd/drm2/radeon/radeon_pci.c			radeon
 file	external/bsd/drm2/radeon/radeondrmkmsfb.c		radeondrmkmsfb
 # Generated from radeon2netbsd.
-#file	external/bsd/drm2/dist/drm/radeon/radeon_acpi.c	radeon
+file	external/bsd/drm2/dist/drm/radeon/radeon_acpi.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_agp.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_asic.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_atom.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_atombios.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_atombios_dp.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_atombios_encoders.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_atombios_i2c.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_audio.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_benchmark.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_bios.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_btc_dpm.c	radeon
 file	external/bsd/drm2/dist/drm/radeon/radeon_cayman_blit_shaders.c	radeon

--- src/sys/modules/amdgpu/Makefile 2023/09/10 15:12:39	1.8
+++ src/sys/modules/amdgpu/Makefile 2024/04/16 14:34:03	1.9

 @@ -1,30 +1,35 @@
-# $NetBSD: Makefile,v 1.8 2023/09/10 15:12:39 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2024/04/16 14:34:03 riastradh Exp $
 .include "../Makefile.inc"
 .include "../drmkms/Makefile.inc"
 KMOD=	amdgpu
 IOCONF=	amdgpu.ioconf
 MKLDSCRIPT=yes
 WARNS=	3
 .if ${MACHINE_ARCH} == "x86_64"
 COPTS.amdgpu_float+=	${${ACTIVE_CC} == "gcc" :? -mhard-float :} -msse -msse2
 .elif !empty(MACHINE_ARCH:Maarch64*)
 COPTS.amdgpu_float+=	-march=armv8-a
 .endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
 	${MACHINE_CPU} == "arm" || ${MACHINE_CPU} == "aarch64"
 CPPFLAGS+=	-DNACPICA=1
 .endif
 # sed -ne 's,^makeoptions	amdgpu	"\([^.]*\)\.amdgpu"+="\(.*\)",\1+=	\2,gp' <files.amdgpu | sed -e 's,\$S,${S},g'
 # Note: order of includes is significant.
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/include/asic_reg
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/include
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/amdgpu
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/powerplay/inc
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/powerplay/smumgr
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/acp/include
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/display
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/display/include
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/display/dc
 CPPFLAGS+=	-I${S}/external/bsd/drm2/dist/drm/amd/display/dc/inc
 @@ -135,26 +140,27 @@ COPTS.amdgpu_rn_clk_mgr.c+=	${COPTS.amdg
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../display/dmub/src
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../display/modules/color
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../display/modules/freesync
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../display/modules/hdcp
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../display/modules/info_packet
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../display/modules/power
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/hwmgr
 .PATH:	${S}/external/bsd/drm2/dist/drm/amd/amdgpu/../powerplay/smumgr
 # sed -ne 's,^file	external/bsd/drm2/.*/\([^/ 	]*\)	.*,SRCS+=	\1,gp' <files.amdgpu | sort -u
 SRCS+=	amdgpu_acp.c
 SRCS+=	amdgpu_acp_hw.c
 SRCS+=	amdgpu_acpi.c
 SRCS+=	amdgpu_afmt.c
 SRCS+=	amdgpu_amd_powerplay.c
 SRCS+=	amdgpu_amdkfd.c
 SRCS+=	amdgpu_arct_reg_init.c
 SRCS+=	amdgpu_arcturus_ppt.c
 SRCS+=	amdgpu_athub_v1_0.c
 SRCS+=	amdgpu_athub_v2_0.c
 SRCS+=	amdgpu_atom.c
 SRCS+=	amdgpu_atombios.c
 SRCS+=	amdgpu_atombios_crtc.c
 SRCS+=	amdgpu_atombios_dp.c
 SRCS+=	amdgpu_atombios_encoders.c
 SRCS+=	amdgpu_atombios_i2c.c