[src/trunk]: src/sys/external/bsd/drm2/nouveau push the real attach down via ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c1761fbf7c47
branches:  trunk
changeset: 341247:c1761fbf7c47
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Oct 27 21:46:42 2015 +0000

description:
push the real attach down via config_mountroot, like radeon, as we
need firmware files.. which are currently missing:

drm kern error: nouveau E[  PGRAPH][nouveau0] failed to load fuc409c

diffstat:

 sys/external/bsd/drm2/nouveau/nouveau_pci.c |  20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r 1031fedeff4f -r c1761fbf7c47 sys/external/bsd/drm2/nouveau/nouveau_pci.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Tue Oct 27 19:58:09 2015 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Tue Oct 27 21:46:42 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_pci.c,v 1.5 2015/10/27 13:21:19 riastradh Exp $        */
+/*     $NetBSD: nouveau_pci.c,v 1.6 2015/10/27 21:46:42 mrg Exp $      */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.5 2015/10/27 13:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.6 2015/10/27 21:46:42 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -51,6 +51,7 @@
 
 struct nouveau_pci_softc {
        device_t                sc_dev;
+       struct pci_attach_args  sc_pa;
        enum {
                NOUVEAU_TASK_ATTACH,
                NOUVEAU_TASK_WORKQUEUE,
@@ -66,6 +67,7 @@
 
 static int     nouveau_pci_match(device_t, cfdata_t, void *);
 static void    nouveau_pci_attach(device_t, device_t, void *);
+static void    nouveau_attach_real(device_t);
 static int     nouveau_pci_detach(device_t, int);
 
 static bool    nouveau_pci_suspend(device_t, const pmf_qual_t *);
@@ -102,17 +104,27 @@
 {
        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;
+       sc->sc_pa = *pa;
 
        if (!pmf_device_register(self, &nouveau_pci_suspend,
                &nouveau_pci_resume))
                aprint_error_dev(self, "unable to establish power handler\n");
 
+       config_mountroot(self, &nouveau_attach_real);
+}
+
+static void
+nouveau_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_task_state = NOUVEAU_TASK_ATTACH;
        SIMPLEQ_INIT(&sc->sc_task_u.attach);