Module Name: src Committed By: macallan Date: Thu Apr 12 19:09:18 UTC 2012
Modified Files: src/sys/arch/sparc64/dev: ffb.c Log Message: don't assume that wscons assumes BGR ordering and request it explicitly To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc64/dev/ffb.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/arch/sparc64/dev/ffb.c diff -u src/sys/arch/sparc64/dev/ffb.c:1.50 src/sys/arch/sparc64/dev/ffb.c:1.51 --- src/sys/arch/sparc64/dev/ffb.c:1.50 Wed Jan 11 15:53:32 2012 +++ src/sys/arch/sparc64/dev/ffb.c Thu Apr 12 19:09:18 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ffb.c,v 1.50 2012/01/11 15:53:32 macallan Exp $ */ +/* $NetBSD: ffb.c,v 1.51 2012/04/12 19:09:18 macallan Exp $ */ /* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */ /* @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.50 2012/01/11 15:53:32 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.51 2012/04/12 19:09:18 macallan Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -1188,6 +1188,14 @@ ffb_init_screen(void *cookie, struct vco #endif DPRINTF(("ffb_init_screen: addr: %08lx\n",(ulong)ri->ri_bits)); + /* explicitly request BGR in case the default changes */ + ri->ri_rnum = 8; + ri->ri_gnum = 8; + ri->ri_bnum = 8; + ri->ri_rpos = 0; + ri->ri_gpos = 8; + ri->ri_bpos = 16; + rasops_init(ri, 0, 0); ri->ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,