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

Fix PR kern/46376 with Nat Sloss's patch (with slight modification).

Browse Source 
Serial console now works on x86 with genfb enabled.
This commit is contained in:
jakllsch 2014-01-16 18:41:10 +00:00
parent 5b57b2e95d
commit edc30bfbd4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/pci/genfb_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfb_pci.c,v 1.34 2012/03/13 18:40:31 elad Exp $ */
/* $NetBSD: genfb_pci.c,v 1.35 2014/01/16 18:41:10 jakllsch Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.34 2012/03/13 18:40:31 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.35 2014/01/16 18:41:10 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -99,8 +99,10 @@ pci_genfb_attach(device_t parent, device_t self, void *aux)
struct pci_genfb_softc *sc = device_private(self);
struct pci_attach_args *pa = aux;
struct genfb_ops ops;
prop_dictionary_t dict;
pcireg_t rom;
int idx, bar, type;
bool isconsole;
pci_aprint_devinfo(pa, NULL);
@ -185,6 +187,10 @@ pci_genfb_attach(device_t parent, device_t self, void *aux)
ops.genfb_mmap = pci_genfb_mmap;
ops.genfb_borrow = pci_genfb_borrow;
isconsole = genfb_is_console() != 0;
dict = device_properties(self);
prop_dictionary_set_bool(dict, "is_console", isconsole);
if (genfb_attach(&sc->sc_gen, &ops) == 0) {
/* now try to attach a DRM */