 @@ -1,14 +1,14 @@
-/*	$NetBSD: i915_pci_autoconf.c,v 1.5 2021/12/19 11:33:49 riastradh Exp $	*/
+/*	$NetBSD: i915_pci_autoconf.c,v 1.6 2021/12/19 11:53:02 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.5 2021/12/19 11:33:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.6 2021/12/19 11:53:02 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <sys/workqueue.h>
 #include <drm/drm_pci.h>
 #include "i915_drv.h"
 #include "i915_pci.h"
 struct drm_device;
 @@ -54,81 +54,81 @@ struct i915drmkms_softc {
 		I915DRMKMS_TASK_ATTACH,
 		I915DRMKMS_TASK_WORKQUEUE,
 	}				sc_task_state;
 	union {
 		struct workqueue		*workqueue;
 		struct i915drmkms_task_head	attach;
 	}				sc_task_u;
 	struct drm_device		*sc_drm_dev;
 	struct pci_dev			sc_pci_dev;
 	bool				sc_pci_attached;
 	bool				sc_dev_registered;
 };
-static const struct intel_device_info *
+static const struct pci_device_id *
 		i915drmkms_pci_lookup(const struct pci_attach_args *);
 static int	i915drmkms_match(device_t, cfdata_t, void *);
 static void	i915drmkms_attach(device_t, device_t, void *);
 static void	i915drmkms_attach_real(device_t);
 static int	i915drmkms_detach(device_t, int);
 static bool	i915drmkms_suspend(device_t, const pmf_qual_t *);
 static bool	i915drmkms_resume(device_t, const pmf_qual_t *);
 static void	i915drmkms_task_work(struct work *, void *);
 CFATTACH_DECL_NEW(i915drmkms, sizeof(struct i915drmkms_softc),
     i915drmkms_match, i915drmkms_attach, i915drmkms_detach, NULL);
 /* XXX Kludge to get these from i915_drv.c.  */
 extern struct drm_driver *const i915_drm_driver;
 extern const struct pci_device_id *const i915_device_ids;
 extern const size_t i915_n_device_ids;
-static const struct intel_device_info *
+static const struct pci_device_id *
 i915drmkms_pci_lookup(const struct pci_attach_args *pa)
+{
 	size_t i;
 	/* Attach only at function 0 to work around Intel lossage.  */
 	if (pa->pa_function != 0)
 		return NULL;
 	/* We're interested only in Intel products.  */
 	if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_INTEL)
 		return NULL;
 	/* We're interested only in Intel display devices.  */
 	if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY)
 		return NULL;
 	for (i = 0; i < i915_n_device_ids; i++)
 		if (PCI_PRODUCT(pa->pa_id) == i915_device_ids[i].device)
 			break;
 	/* Did we find it?  */
 	if (i == i915_n_device_ids)
 		return NULL;
-	const struct intel_device_info *const info =
+	const struct pci_device_id *ent = &i915_device_ids[i];
-	    (const void *)(uintptr_t)i915_device_ids[i].driver_data;
+	const struct intel_device_info *const info = (struct intel_device_info *) ent->driver_data;
 	if (info->require_force_probe) {
 		printf("i915drmkms: preliminary hardware support disabled\n");
 		return NULL;
+	}
-	return info;
+	return ent;
+}
 static int
 i915drmkms_match(device_t parent, cfdata_t match, void *aux)
+{
 	extern int i915drmkms_guarantee_initialized(void);
 	const struct pci_attach_args *const pa = aux;
 	int error;
 	error = i915drmkms_guarantee_initialized();
 	if (error) {
 		aprint_error("i915drmkms: failed to initialize: %d\n", error);
 		return 0;
 @@ -158,29 +158,28 @@ i915drmkms_attach(device_t parent, devic
 	 * images.
 	 */
 	sc->sc_dev = self;
 	sc->sc_pa = *pa;
 	config_mountroot(self, &i915drmkms_attach_real);
+}
 static void
 i915drmkms_attach_real(device_t self)
+{
 	struct i915drmkms_softc *const sc = device_private(self);
 	struct pci_attach_args *const pa = &sc->sc_pa;
-	const struct intel_device_info *const info = i915drmkms_pci_lookup(pa);
+	const struct pci_device_id *ent = i915drmkms_pci_lookup(pa);
-	const unsigned long cookie =
+	const struct intel_device_info *const info = (struct intel_device_info *) ent->driver_data;
 	    (unsigned long)(uintptr_t)(const void *)info;
 	int error;
 	KASSERT(info != NULL);
 	sc->sc_task_state = I915DRMKMS_TASK_ATTACH;
 	SIMPLEQ_INIT(&sc->sc_task_u.attach);
 	/* Initialize the Linux PCI device descriptor.  */
 	linux_pci_dev_init(&sc->sc_pci_dev, self, device_parent(self), pa, 0);
 	sc->sc_drm_dev = drm_dev_alloc(i915_drm_driver, self);
 	if (IS_ERR(sc->sc_drm_dev)) {
 		aprint_error_dev(self, "unable to create drm device: %ld\n",
 @@ -188,27 +187,27 @@ i915drmkms_attach_real(device_t self)
 		sc->sc_drm_dev = NULL;
 		return;
+	}
 	/* XXX errno Linux->NetBSD */
 	error = -drm_pci_attach(sc->sc_drm_dev, pa, &sc->sc_pci_dev);
 	if (error) {
 		aprint_error_dev(self, "unable to attach drm: %d\n", error);
 		return;
+	}
 	sc->sc_pci_attached = true;
 	/* XXX errno Linux->NetBSD */
-	error = -drm_dev_register(sc->sc_drm_dev, cookie);
+	error = -i915_driver_probe(&sc->sc_pci_dev, ent);
 	if (error) {
 		aprint_error_dev(self, "unable to register drm: %d\n", error);
 		return;
+	}
 	sc->sc_dev_registered = true;
 	while (!SIMPLEQ_EMPTY(&sc->sc_task_u.attach)) {
 		struct i915drmkms_task *const task =
 		    SIMPLEQ_FIRST(&sc->sc_task_u.attach);
 		SIMPLEQ_REMOVE_HEAD(&sc->sc_task_u.attach, ift_u.queue);
 		(*task->ift_fn)(task);
+	}