summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormacallan <macallan@NetBSD.org>2010-09-14 18:28:18 +0000
committermacallan <macallan@NetBSD.org>2010-09-14 18:28:18 +0000
commitdab970d65a9639e3ce2b08b9b83b05817a059d5e (patch)
treef00384635abb8bb4a9f319815e0c47b9b597160c /sys/dev
parent218cd6edd99ed0182a54571bb9c304b680c2a5f2 (diff)
always make sure we can access the framebuffer - having more than one wsdisplay
is perfectly reasonable these days
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sbus/cgthree_sbus.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/sbus/cgthree_sbus.c b/sys/dev/sbus/cgthree_sbus.c
index 98e8fb4546b..6d04190a072 100644
--- a/sys/dev/sbus/cgthree_sbus.c
+++ b/sys/dev/sbus/cgthree_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.29 2009/09/18 16:43:19 tsutsui Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.30 2010/09/14 18:28:18 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.29 2009/09/18 16:43:19 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.30 2010/09/14 18:28:18 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,8 +155,7 @@ cgthreeattach_sbus(device_t parent, device_t self, void *args)
/*
* When the ROM has mapped in a cgthree display, the address
* maps only the video RAM, so in any case we have to map the
- * registers ourselves. We only need the video RAM if we are
- * going to print characters via rconsole.
+ * registers ourselves.
*/
if (sbus_bus_map(sa->sa_bustag,
sa->sa_slot,
@@ -175,7 +174,7 @@ cgthreeattach_sbus(device_t parent, device_t self, void *args)
if (sa->sa_npromvaddrs != 0)
fb->fb_pixels = (void *)(u_long)sa->sa_promvaddrs[0];
- if (isconsole && fb->fb_pixels == NULL) {
+ if (fb->fb_pixels == NULL) {
int ramsize = fb->fb_type.fb_height * fb->fb_linebytes;
if (sbus_bus_map(sa->sa_bustag,
sa->sa_slot,