[src/trunk]: src/sys/dev/sbus always make sure we can access the framebuffer ...

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

details:   https://anonhg.NetBSD.org/src/rev/3ea35b8c56c0
branches:  trunk
changeset: 757696:3ea35b8c56c0
user:      macallan <macallan%NetBSD.org@localhost>
date:      Tue Sep 14 18:28:18 2010 +0000

description:
always make sure we can access the framebuffer - having more than one wsdisplay
is perfectly reasonable these days

diffstat:

 sys/dev/sbus/cgthree_sbus.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r e7ca0d849012 -r 3ea35b8c56c0 sys/dev/sbus/cgthree_sbus.c
--- a/sys/dev/sbus/cgthree_sbus.c       Tue Sep 14 11:57:03 2010 +0000
+++ b/sys/dev/sbus/cgthree_sbus.c       Tue Sep 14 18:28:18 2010 +0000
@@ -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 @@
        /*
         * 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 @@
 
        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,