Module Name: src
Committed By: macallan
Date: Tue Sep 14 18:28:18 UTC 2010
Modified Files:
src/sys/dev/sbus: cgthree_sbus.c
Log Message:
always make sure we can access the framebuffer - having more than one wsdisplay
is perfectly reasonable these days
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sbus/cgthree_sbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/cgthree_sbus.c
diff -u src/sys/dev/sbus/cgthree_sbus.c:1.29 src/sys/dev/sbus/cgthree_sbus.c:1.30
--- src/sys/dev/sbus/cgthree_sbus.c:1.29 Fri Sep 18 16:43:19 2009
+++ src/sys/dev/sbus/cgthree_sbus.c Tue Sep 14 18:28:18 2010
@@ -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,
