Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert rev 1.6. we don't have access to those files as normal files

Browse Source 
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.)
This commit is contained in:
mrg 2016-04-19 06:57:37 +00:00
parent 220ff4e7a0
commit 9cd640c618
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/external/bsd/drm2/nouveau/nouveau_pci.c vendored
View File

@ -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. * Copyright (c) 2015 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #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/types.h>
#include <sys/device.h> #include <sys/device.h>
@ -51,7 +51,6 @@ SIMPLEQ_HEAD(nouveau_pci_task_head, nouveau_pci_task);
struct nouveau_pci_softc { struct nouveau_pci_softc {
device_t sc_dev; device_t sc_dev;
struct pci_attach_args sc_pa;
enum { enum {
NOUVEAU_TASK_ATTACH, NOUVEAU_TASK_ATTACH,
NOUVEAU_TASK_WORKQUEUE, NOUVEAU_TASK_WORKQUEUE,
@ -67,7 +66,6 @@ struct nouveau_pci_softc {
static int nouveau_pci_match(device_t, cfdata_t, void *); 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(device_t, device_t, void *);
static void nouveau_attach_real(device_t);
static int nouveau_pci_detach(device_t, int); static int nouveau_pci_detach(device_t, int);
static bool nouveau_pci_suspend(device_t, const pmf_qual_t *); static bool nouveau_pci_suspend(device_t, const pmf_qual_t *);
@ -104,27 +102,17 @@ nouveau_pci_attach(device_t parent, device_t self, void *aux)
{ {
struct nouveau_pci_softc *const sc = device_private(self); struct nouveau_pci_softc *const sc = device_private(self);
const struct pci_attach_args *const pa = aux; const struct pci_attach_args *const pa = aux;
uint64_t devname;
int error;
pci_aprint_devinfo(pa, NULL); pci_aprint_devinfo(pa, NULL);
sc->sc_dev = self; sc->sc_dev = self;
sc->sc_pa = *pa;
if (!pmf_device_register(self, &nouveau_pci_suspend, if (!pmf_device_register(self, &nouveau_pci_suspend,
&nouveau_pci_resume)) &nouveau_pci_resume))
aprint_error_dev(self, "unable to establish power handler\n"); 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; sc->sc_task_state = NOUVEAU_TASK_ATTACH;
SIMPLEQ_INIT(&sc->sc_task_u.attach); SIMPLEQ_INIT(&sc->sc_task_u.attach);