 @@ -1,14 +1,14 @@
-/*	$NetBSD: nouveau_pci.c,v 1.8.10.2 2018/12/25 11:25:00 martin Exp $	*/
+/*	$NetBSD: nouveau_pci.c,v 1.8.10.3 2020/03/08 09:28:04 martin Exp $	*/
 /*-
  * Copyright (c) 2015 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,147 +20,160 @@
  * ``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: nouveau_pci.c,v 1.8.10.2 2018/12/25 11:25:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.8.10.3 2020/03/08 09:28:04 martin Exp $");
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/workqueue.h>
 #include <sys/module.h>
 #include <drm/drmP.h>
 #include <engine/device.h>
 #include "nouveau_drm.h"
 #include "nouveau_pci.h"
 MODULE(MODULE_CLASS_DRIVER, nouveau_pci, "nouveau,drmkms_pci");
 SIMPLEQ_HEAD(nouveau_pci_task_head, nouveau_pci_task);
 struct nouveau_pci_softc {
 	device_t		sc_dev;
 	struct pci_attach_args	sc_pa;
 	enum {
 		NOUVEAU_TASK_ATTACH,
 		NOUVEAU_TASK_WORKQUEUE,
 	}			sc_task_state;
 	union {
 		struct workqueue		*workqueue;
 		struct nouveau_pci_task_head	attach;
 	}			sc_task_u;
 	struct drm_device	*sc_drm_dev;
 	struct pci_dev		sc_pci_dev;
 	struct nouveau_device	*sc_nv_dev;
 };
 static int	nouveau_pci_match(device_t, cfdata_t, void *);
 static void	nouveau_pci_attach(device_t, device_t, void *);
 static void	nouveau_pci_attach_real(device_t);
 static int	nouveau_pci_detach(device_t, int);
 static bool	nouveau_pci_suspend(device_t, const pmf_qual_t *);
 static bool	nouveau_pci_resume(device_t, const pmf_qual_t *);
 static void	nouveau_pci_task_work(struct work *, void *);
 CFATTACH_DECL_NEW(nouveau_pci, sizeof(struct nouveau_pci_softc),
     nouveau_pci_match, nouveau_pci_attach, nouveau_pci_detach, NULL);
 /* Kludge to get this from nouveau_drm.c.  */
 extern struct drm_driver *const nouveau_drm_driver;
 static int
 nouveau_pci_match(device_t parent, cfdata_t match, void *aux)
+{
 	const struct pci_attach_args *const pa = aux;
 	if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_NVIDIA &&
 	    PCI_VENDOR(pa->pa_id) != PCI_VENDOR_NVIDIA_SGS)
 		return 0;
 	if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY)
 		return 0;
 #define IS_BETWEEN(x,y) \
 	(PCI_PRODUCT(pa->pa_id) >= (x) && PCI_PRODUCT(pa->pa_id) <= (y))
 	/*
-	 * NetBSD drm2 needs missing-so-far firmware for Maxwell-based cards:
+	 * NetBSD 8.x drm2 doesn't support Maxwell, Pascal, Volta or Turing
-	 *   0x1380-0x13bf 	GM107
+	 * based cards:
-	 */
+	 *   0x1340-0x137f 	GM108   [1]
-	if (IS_BETWEEN(0x1380, 0x13bf))
+	 *   0x1380-0x13bf 	GM107   [1]
-		return 0;
+	 *   0x13c0-0x13ff 	GM204
 	 *   0x1400-0x147f 	GM206
 	/*
 	 * NetBSD drm2 doesn't support Pascal, Volta or Turing based cards:
 	 *   0x1580-0x15ff 	GP100
 	 *   0x1b00-0x1b7f 	GP102
 	 *   0x1b80-0x1bff 	GP104
 	 *   0x1c00-0x1c7f 	GP106
 	 *   0x1c80-0x1cff 	GP107
 	 *   0x1d00-0x1d7f 	GP108
 	 *   0x1d80-0x1dff 	GV100
 	 *   0x1e00-0x1e7f 	TU102
 	 *   0x1e80-0x1eff 	TU104
 	 *   0x1f00-0x1f7f 	TU106
 	 *   0x1f80-0x1fff 	TU117
 	 *   0x2180-0x21ff 	TU116
+	 *
 	 * [1] GM107/GM108 may work if firmware files are provided.
 	 * There are Windows and Linux methods to extract them, but they
 	 * are not readily available.  NetBSD-9 drm works.
+	 *
 	 * reduce this to >= 1300, so that new chipsets not explictly
 	 * listed above will be picked up.
+	 *
 	 * XXX perhaps switch this to explicitly match known list.
 	 */
 	if (PCI_PRODUCT(pa->pa_id) >= 0x1300)
 	if (IS_BETWEEN(0x1580, 0x15ff) ||
 	    IS_BETWEEN(0x1b00, 0x1b7f) ||
 	    IS_BETWEEN(0x1b80, 0x1bff) ||
 	    IS_BETWEEN(0x1c00, 0x1c7f) ||
 	    IS_BETWEEN(0x1c80, 0x1cff) ||
 	    IS_BETWEEN(0x1d00, 0x1d7f) ||
 	    IS_BETWEEN(0x1d80, 0x1dff) ||
 	    IS_BETWEEN(0x1e00, 0x1e7f) ||
 	    IS_BETWEEN(0x1e80, 0x1eff) ||
 	    IS_BETWEEN(0x1f00, 0x1f7f))
 		return 0;
 #undef IS_BETWEEN
 	return 6;		/* XXX Beat genfb_pci...  */
+}
 extern char *nouveau_config;
 extern char *nouveau_debug;
 static void
 nouveau_pci_attach(device_t parent, device_t self, void *aux)
+{
 	struct nouveau_pci_softc *const sc = device_private(self);
 	const struct pci_attach_args *const pa = aux;
 	uint64_t devname;
 	int error;
 	pci_aprint_devinfo(pa, NULL);
-	sc->sc_dev = self;
+	if (!pmf_device_register(self, &nouveau_pci_suspend, &nouveau_pci_resume))
 	if (!pmf_device_register(self, &nouveau_pci_suspend,
 		&nouveau_pci_resume))
 		aprint_error_dev(self, "unable to establish power handler\n");
-	sc->sc_task_state = NOUVEAU_TASK_ATTACH;
+	/*
-	SIMPLEQ_INIT(&sc->sc_task_u.attach);
+	 * Trivial initialization first; the rest will come after we
 	 * have mounted the root file system and can load firmware
 	 * images.
 	 */
 	sc->sc_dev = NULL;
 	sc->sc_pa = *pa;
 	config_mountroot(self, &nouveau_pci_attach_real);
+}
 static void
 nouveau_pci_attach_real(device_t self)
+{
 	struct nouveau_pci_softc *const sc = device_private(self);
 	const struct pci_attach_args *const pa = &sc->sc_pa;
 	uint64_t devname;
 	int error;
 	sc->sc_dev = self;
  	sc->sc_task_state = NOUVEAU_TASK_ATTACH;
  	SIMPLEQ_INIT(&sc->sc_task_u.attach);
 	devname = (uint64_t)device_unit(device_parent(self)) << 32;
 	devname |= pa->pa_bus << 16;
 	/* XXX errno Linux->NetBSD */
 	error = -nouveau_device_create(&sc->sc_pci_dev, NOUVEAU_BUS_PCI,
 	    devname, device_xname(self), nouveau_config, nouveau_debug,
 	    &sc->sc_nv_dev);
 	if (error) {
 		aprint_error_dev(self, "unable to create nouveau device: %d\n",
 		    error);
 		return;
+	}
 @@ -187,26 +200,30 @@ nouveau_pci_attach(device_t parent, devi
 		aprint_error_dev(self, "unable to create workqueue: %d\n",
 		    error);
 		sc->sc_task_u.workqueue = NULL;
 		return;
+	}
+}
 static int
 nouveau_pci_detach(device_t self, int flags)
+{
 	struct nouveau_pci_softc *const sc = device_private(self);
 	int error;
 	if (sc->sc_dev == NULL)
 		/* Not done attaching.  */
 		return EBUSY;
 	/* XXX Check for in-use before tearing it all down...  */
 	error = config_detach_children(self, flags);
 	if (error)
 		return error;
 	if (sc->sc_task_state == NOUVEAU_TASK_ATTACH)
 		goto out0;
 	if (sc->sc_task_u.workqueue != NULL) {
 		workqueue_destroy(sc->sc_task_u.workqueue);
 		sc->sc_task_u.workqueue = NULL;
+	}
 	if (sc->sc_nv_dev == NULL)