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

Do not attach genfb when the frame buffer is not flagged as being console

Browse Source 
(e.g. when a serial console is used).
Approved by macallan.
This commit is contained in:
phx 2008-03-09 20:32:30 +00:00
parent e9810351a7
commit 7bca1efe39
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: genfb_pci.c,v 1.6 2008/02/27 23:59:37 macallan Exp $ */
/* $NetBSD: genfb_pci.c,v 1.7 2008/03/09 20:32:30 phx Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.6 2008/02/27 23:59:37 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.7 2008/03/09 20:32:30 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -162,10 +162,11 @@ pci_genfb_attach(struct device *parent, struct device *self, void *aux)
ops.genfb_ioctl = pci_genfb_ioctl;
ops.genfb_mmap = pci_genfb_mmap;
genfb_attach(&sc->sc_gen, &ops);
if (genfb_attach(&sc->sc_gen, &ops) == 0) {
/* now try to attach a DRM */
config_found_ia(self, "drm", aux, pci_genfb_drm_print);
/* now try to attach a DRM */
config_found_ia(self, "drm", aux, pci_genfb_drm_print);
}
}
static int

44
sys/dev/wsfb/genfb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfb.c,v 1.13 2007/12/17 15:38:31 macallan Exp $ */
/* $NetBSD: genfb.c,v 1.14 2008/03/09 20:32:30 phx Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.13 2007/12/17 15:38:31 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.14 2008/03/09 20:32:30 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -146,6 +146,16 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
int i, j;
bool console;
dict = device_properties(&sc->sc_dev);
prop_dictionary_get_bool(dict, "is_console", &console);
/* do not attach when we're not console */
if (!console) {
aprint_normal("%s: no console, unable to continue",
sc->sc_dev.dv_xname);
return -1;
}
aprint_verbose("%s: framebuffer at %p, size %dx%d, depth %d, "
"stride %d\n", sc->sc_dev.dv_xname, sc->sc_fbaddr,
sc->sc_width, sc->sc_height, sc->sc_depth, sc->sc_stride);
@ -165,10 +175,6 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
sc->sc_shadowfb = malloc(sc->sc_fbsize, M_DEVBUF, M_WAITOK);
dict = device_properties(&sc->sc_dev);
prop_dictionary_get_bool(dict, "is_console", &console);
vcons_init(&sc->vd, sc, &sc->sc_defaultscreen_descr,
&genfb_accessops);
sc->vd.init_screen = genfb_init_screen;
@ -178,24 +184,16 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
ri = &sc->sc_console_screen.scr_ri;
if (console) {
vcons_init_screen(&sc->vd, &sc->sc_console_screen, 1,
&defattr);
sc->sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
vcons_init_screen(&sc->vd, &sc->sc_console_screen, 1,
&defattr);
sc->sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
sc->sc_defaultscreen_descr.textops = &ri->ri_ops;
sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, 0,
defattr);
} else {
/*
* since we're not the console we can postpone the rest
* until someone actually allocates a screen for us
*/
(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
}
sc->sc_defaultscreen_descr.textops = &ri->ri_ops;
sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, 0,
defattr);
/* Clear the whole screen to bring it to a known state. */
(*ri->ri_ops.eraserows)(ri, 0, ri->ri_rows, defattr);