 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_opregion.c,v 1.5 2021/12/24 15:08:09 riastradh Exp $	*/
+/*	$NetBSD: intel_opregion.c,v 1.6 2022/02/27 21:22:01 riastradh Exp $	*/
 /*
  * Copyright 2008 Intel Corporation <hong.liu@intel.com>
  * Copyright 2008 Red Hat <mjg@redhat.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, sub license, 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,31 @@
+ *
  * 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 INTEL 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: intel_opregion.c,v 1.5 2021/12/24 15:08:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.6 2022/02/27 21:22:01 riastradh Exp $");
 #ifdef __NetBSD__
 #include <dev/acpi/acpi_display.h>
 #endif
 #include <linux/acpi.h>
 #include <linux/dmi.h>
 #include <linux/firmware.h>
 #include <acpi/video.h>
 #include <drm/i915_drm.h>
 #include "display/intel_panel.h"
 #include "i915_drv.h"
 #include "intel_display_types.h"
 #include "intel_opregion.h"
 @@ -613,47 +617,43 @@ static void asle_work(struct work_struct
+}
 void intel_opregion_asle_intr(struct drm_i915_private *dev_priv)
+{
 	if (dev_priv->opregion.asle)
 		schedule_work(&dev_priv->opregion.asle_work);
+}
 #define ACPI_EV_DISPLAY_SWITCH (1<<0)
 #define ACPI_EV_LID            (1<<1)
 #define ACPI_EV_DOCK           (1<<2)
 #ifdef __NetBSD__
 static struct intel_opregion *system_opregion;
 static void
-intel_opregion_video_event(ACPI_HANDLE hdl, uint32_t notify, void *opaque)
+intel_opregion_video_event(ACPI_HANDLE hdl, uint32_t notify, void *cookie)
+{
-	device_t self = opaque;
+	struct intel_opregion *opregion = cookie;
-	struct opregion_acpi *acpi;
+	struct opregion_acpi *acpi = opregion->acpi;
-	DRM_DEBUG_DRIVER("notify=0x%08x\n", notify);
+	DRM_DEBUG_DRIVER("notify=0x%08x csts=0x%02x cevt=0x%02x\n", notify,
 	    acpi->csts, acpi->cevt);
-	if (!system_opregion)
+	/*
 	 * The firmware sets CSTS to 0x03 `Dispatched (ASL)' before
 	 * issuing any graphics notification, and won't issue
 	 * additional notifications until the graphics driver sets CSTS
 	 * to 0x00 `Success (Driver)' to acknowledge it.
 	 */
 	if (acpi->csts != 0x03)
 		return;
 	acpi = system_opregion->acpi;
 	if (notify != 0x80) {
 		aprint_error_dev(self, "unknown notify 0x%02x\n", notify);
 	} else if ((acpi->cevt & 1) == 0) {
 		aprint_error_dev(self, "bad notify\n");
 	acpi->csts = 0;
+}
 #else	/* !__NetBSD__ */
 /*
  * The only video events relevant to opregion are 0x80. These indicate either a
  * docking event, lid switch or display switch request. In Linux, these are
  * handled by the dock, button and video drivers.
  */
 static int intel_opregion_video_event(struct notifier_block *nb,
 				      unsigned long val, void *data)
+{
 	struct intel_opregion *opregion = container_of(nb, struct intel_opregion,
 						       acpi_notifier);
 @@ -1137,33 +1137,29 @@ intel_opregion_get_panel_type(struct drm
 	return ret - 1;
+}
 void intel_opregion_register(struct drm_i915_private *i915)
+{
 	struct intel_opregion *opregion = &i915->opregion;
 	if (!opregion->header)
 		return;
 	if (opregion->acpi) {
 #ifdef __NetBSD__
-		if (i915->drm.pdev->pd_ad != NULL) {
+		opregion->acpi_notifier =
-			/* XXX gross but expedient */
+		    acpidisp_register_notify(intel_opregion_video_event,
-			KASSERT(system_opregion == NULL);
+			opregion);
 			system_opregion = opregion;
 			acpi_register_notify(i915->drm.pdev->pd_ad,
 			    intel_opregion_video_event);
 #else
 		opregion->acpi_notifier.notifier_call =
 			intel_opregion_video_event;
 		register_acpi_notifier(&opregion->acpi_notifier);
 #endif
+	}
 	intel_opregion_resume(i915);
+}
 void intel_opregion_resume(struct drm_i915_private *i915)
+{
 	struct intel_opregion *opregion = &i915->opregion;
 @@ -1210,29 +1206,29 @@ void intel_opregion_suspend(struct drm_i
 		opregion->acpi->drdy = 0;
+}
 void intel_opregion_unregister(struct drm_i915_private *i915)
+{
 	struct intel_opregion *opregion = &i915->opregion;
 	intel_opregion_suspend(i915, PCI_D1);
 	if (!opregion->header)
 		return;
 #ifdef __NetBSD__
-	if (opregion->acpi) {
+	if (opregion->acpi_notifier) {
-		if (i915->drm.pdev->pd_ad != NULL)
+		acpidisp_deregister_notify(opregion->acpi_notifier);
-			acpi_deregister_notify(i915->drm.pdev->pd_ad);
+		opregion->acpi_notifier = NULL;
+	}
 #else
 	if (opregion->acpi_notifier.notifier_call) {
 		unregister_acpi_notifier(&opregion->acpi_notifier);
 		opregion->acpi_notifier.notifier_call = NULL;
+	}
 #endif
 	/* just clear all opregion memory pointers now */
 #ifdef __NetBSD__
 	size_t rvds = opregion->asle->rvds;
 	AcpiOsUnmapMemory(opregion->header, OPREGION_SIZE);
 #else

 @@ -1,14 +1,14 @@
-/*	$NetBSD: intel_opregion.h,v 1.4 2021/12/24 15:08:09 riastradh Exp $	*/
+/*	$NetBSD: intel_opregion.h,v 1.5 2022/02/27 21:22: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
 @@ -41,27 +41,31 @@ struct opregion_asle;
 struct intel_opregion {
 	struct opregion_header *header;
 	struct opregion_acpi *acpi;
 	struct opregion_swsci *swsci;
 	u32 swsci_gbda_sub_functions;
 	u32 swsci_sbcb_sub_functions;
 	struct opregion_asle *asle;
 	void *rvda;
 	void *vbt_firmware;
 	const void *vbt;
 	u32 vbt_size;
 	u32 *lid_state;
 	struct work_struct asle_work;
 #ifdef __NetBSD__
 	struct acpidisp_notifier *acpi_notifier;
 #else
 	struct notifier_block acpi_notifier;
 #endif
 };
 #define OPREGION_SIZE            (8 * 1024)
 #ifdef CONFIG_ACPI
 int intel_opregion_setup(struct drm_i915_private *dev_priv);
 void intel_opregion_register(struct drm_i915_private *dev_priv);
 void intel_opregion_unregister(struct drm_i915_private *dev_priv);
 void intel_opregion_resume(struct drm_i915_private *dev_priv);
 void intel_opregion_suspend(struct drm_i915_private *dev_priv,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_module.c,v 1.17 2021/12/19 11:49:12 riastradh Exp $	*/
+/*	$NetBSD: i915_module.c,v 1.18 2022/02/27 21:22:01 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,43 +20,43 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.17 2021/12/19 11:49:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.18 2022/02/27 21:22:01 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/module.h>
 #ifndef _MODULE
 #include <sys/once.h>
 #endif
 #include <sys/systm.h>
 #include <drm/drm_device.h>
 #include <drm/drm_sysctl.h>
 #include "i915_drv.h"
 #include "i915_globals.h"
 #include "gt/intel_rps.h"
-MODULE(MODULE_CLASS_DRIVER, i915drmkms, "drmkms,drmkms_pci"); /* XXX drmkms_i2c */
+MODULE(MODULE_CLASS_DRIVER, i915drmkms, "acpivga,drmkms,drmkms_pci"); /* XXX drmkms_i2c */
 #ifdef _MODULE
 #include "ioconf.c"
 #endif
 struct drm_sysctl_def i915_def = DRM_SYSCTL_INIT();
 /* XXX use link sets for DEFINE_SPINLOCK */
 extern spinlock_t i915_sw_fence_lock;
 extern spinlock_t *const i915_schedule_lock;
 int i915_global_buddy_init(void); /* XXX */

 @@ -1,19 +1,19 @@
-#	$NetBSD: files.i915drmkms,v 1.85 2021/12/21 12:55:23 tnn Exp $
+#	$NetBSD: files.i915drmkms,v 1.86 2022/02/27 21:22:01 riastradh Exp $
 version	20180827
 define	intelfbbus	{ }
-device	i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810, firmload
+device	i915drmkms: acpivga, drmkms, drmkms_pci, intelfbbus, agp_i810, firmload
 attach	i915drmkms at pci
 device	intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
 attach	intelfb at intelfbbus
 # This code comes from the Linux kernel, which assumes signed
 # overflow is OK.
 makeoptions 	i915drmkms	"COPTS.i915drmkms"+="-fwrapv"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-I$S/external/bsd/drm2/i915drm"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-I$S/external/bsd/drm2/dist/drm/i915"
 makeoptions	i915drmkms	"CPPFLAGS.i915drmkms"+="-DCONFIG_DRM_FBDEV_EMULATION=1"