[src/trunk]: src/sys/external/bsd/drm2/nouveau revert rev 1.6. we don't have...

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

details:   https://anonhg.NetBSD.org/src/rev/944b9a41a61f
branches:  trunk
changeset: 814915:944b9a41a61f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Apr 19 06:57:37 2016 +0000

description:
revert rev 1.6.  we don't have access to those files as normal files
and possible will get them directly elsewhere soon.

(if i hack my nouveau to ignore fireware failure, it end up having
a vaguely working console and slowly working X, which is better than
the current situation.)

diffstat:

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

diffs (64 lines):

diff -r b7e4db6e0582 -r 944b9a41a61f sys/external/bsd/drm2/nouveau/nouveau_pci.c
--- a/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Tue Apr 19 05:48:10 2016 +0000
+++ b/sys/external/bsd/drm2/nouveau/nouveau_pci.c       Tue Apr 19 06:57:37 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_pci.c,v 1.7 2016/02/11 04:51:44 riastradh Exp $        */
+/*     $NetBSD: nouveau_pci.c,v 1.8 2016/04/19 06:57:37 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.7 2016/02/11 04:51:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.8 2016/04/19 06:57:37 mrg Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -51,7 +51,6 @@
 
 struct nouveau_pci_softc {
        device_t                sc_dev;
-       struct pci_attach_args  sc_pa;
        enum {
                NOUVEAU_TASK_ATTACH,
                NOUVEAU_TASK_WORKQUEUE,
@@ -67,7 +66,6 @@
 
 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 *);
@@ -104,27 +102,17 @@
 {
        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);