Module Name: src
Committed By: macallan
Date: Wed Aug 18 21:11:50 UTC 2010
Modified Files:
src/sys/dev/sbus: cgtwelve.c files.sbus
Log Message:
- add support for running the console in 8 bit colour
- make shadow fb optional
- use VCONS_DONT_READ if there's no shadow fb
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/sbus/cgtwelve.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/sbus/files.sbus
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/cgtwelve.c
diff -u src/sys/dev/sbus/cgtwelve.c:1.3 src/sys/dev/sbus/cgtwelve.c:1.4
--- src/sys/dev/sbus/cgtwelve.c:1.3 Wed Apr 14 04:37:11 2010
+++ src/sys/dev/sbus/cgtwelve.c Wed Aug 18 21:11:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cgtwelve.c,v 1.3 2010/04/14 04:37:11 macallan Exp $ */
+/* $NetBSD: cgtwelve.c,v 1.4 2010/08/18 21:11:50 macallan Exp $ */
/*-
* Copyright (c) 2010 Michael Lorenz
@@ -29,7 +29,7 @@
/* a console driver for the Sun CG12 / Matrox SG3 graphics board */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgtwelve.c,v 1.3 2010/04/14 04:37:11 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgtwelve.c,v 1.4 2010/08/18 21:11:50 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,6 +54,7 @@
#include <dev/wscons/wsdisplay_vconsvar.h>
#include <dev/sbus/cgtwelvereg.h>
+#include <dev/ic/bt462reg.h>
#include "opt_wsemul.h"
#include "opt_cgtwelve.h"
@@ -127,6 +128,8 @@
NULL, /* scroll */
};
+extern const u_char rasops_cmap[768];
+
static int
cgtwelve_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -161,9 +164,13 @@
/* read geometry information from the device tree */
sc->sc_width = prom_getpropint(sa->sa_node, "width", 1152);
sc->sc_height = prom_getpropint(sa->sa_node, "height", 900);
+#ifdef CG12_COLOR
+ sc->sc_stride = sc->sc_width;
+#else
sc->sc_stride = (sc->sc_width + 7) >> 3;
-
+#endif
sc->sc_fbsize = sc->sc_height * sc->sc_stride;
+
sc->sc_fbaddr = (void *)prom_getpropint(sa->sa_node, "address", 0);
if (sc->sc_fbaddr == NULL) {
if (sbus_bus_map(sa->sa_bustag,
@@ -179,7 +186,6 @@
aprint_normal_dev(self, "%d x %d\n", sc->sc_width, sc->sc_height);
-
if (sbus_bus_map(sa->sa_bustag,
sa->sa_slot,
sa->sa_offset + CG12_OFF_REGISTERS,
@@ -211,9 +217,17 @@
}
sc->sc_int = bus_space_vaddr(sa->sa_bustag, bh);
+#ifdef CG12_COLOR
+ cgtwelve_setup(sc, 8);
+#else
cgtwelve_setup(sc, 1);
-
+#endif
+#ifdef CG12_SHADOW
sc->sc_shadow = kmem_alloc(sc->sc_fbsize, KM_SLEEP);
+#else
+ sc->sc_shadow = NULL;
+#endif
+
isconsole = fb_is_console(node);
sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
@@ -243,70 +257,18 @@
aa.accesscookie = &sc->vd;
config_found(self, &aa, wsemuldisplaydevprint);
-#if 0
+#ifdef CG12_DEBUG
{
- bus_space_handle_r bh = sc->sc_regh;
- int i, j;
-
- bus_space_write_4(sa->sa_bustag, bh, CG12_EIC_RESET, 0);
-
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_RDMSK_HOST, CG12_PLN_RD_ENABLE);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_WRMSK_HOST, CG12_PLN_WR_ENABLE);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_SL_HOST, CG12_PLN_SL_ENABLE);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_HPAGE, CG12_HPAGE_ENABLE);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_HACCESS, CG12_HACCESS_ENABLE);
- memset(sc->sc_fbaddr, 0, 0x10000);
-
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_RDMSK_LOC, 0xffffffff);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_WRMSK_LOC, 0xffffffff);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_LACCESS, CG12_HACCESS_24BIT);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_LPAGE, CG12_HPAGE_24BIT);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_SL_LOCAL0, CG12_PLN_SL_24BIT);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_DWG_CTL, DWGCTL_BITBLT | 0x00f30000);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_F_XLEFT, 10);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_F_XRIGHT, 1010);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_Y_DST, 10);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_COLOUR0, 0xffffffff);
-#if 1
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_LENGTH | 0x1000, 800);
-#endif
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_RDMSK_HOST, CG12_PLN_RD_OVERLAY);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_WRMSK_HOST, CG12_PLN_WR_OVERLAY);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12DPU_PLN_SL_HOST, CG12_PLN_SL_OVERLAY);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_HPAGE, CG12_HPAGE_OVERLAY);
- bus_space_write_4(sa->sa_bustag, bh,
- CG12APU_HACCESS, CG12_HACCESS_OVERLAY);
-
- for (i = 0x100; i < 0x300; i += 32) {
- printf("%04x:", i);
- for (j = 0; j < 32; j += 4) {
- printf(" %08x", bus_space_read_4(sa->sa_bustag,
- bh, i + j));
- }
- printf("\n");
+ int i;
+ for (i = 0; i < 0x10; i++) {
+ bus_space_write_4(sc->sc_tag, sc->sc_regh,
+ CG12DAC_ADDR0, (i << 16) | (i << 8) | i);
+ bus_space_write_4(sc->sc_tag, sc->sc_regh,
+ CG12DAC_ADDR1, 0x010101);
+ printf("%02x: %08x\n", i, bus_space_read_4(sc->sc_tag,
+ sc->sc_regh, CG12DAC_CTRL));
}
}
- panic("poof");
#endif
}
@@ -403,7 +365,7 @@
static void
cgtwelve_setup(struct cgtwelve_softc *sc, int depth)
{
- int i;
+ int i, j;
/* first let's put some stuff into the WID table */
cgtwelve_write_wid(sc, 0, CG12_WID_8_BIT);
@@ -411,7 +373,17 @@
/* a linear ramp for the gamma table */
for (i = 0; i < 256; i++)
- cgtwelve_write_dac(sc, i + 0x100, i, i, i);
+ cgtwelve_write_dac(sc, i + 0x100, i, i, i);
+
+ j = 0;
+ /* rasops' ANSI colour map */
+ for (i = 0; i < 256; i++) {
+ cgtwelve_write_dac(sc, i,
+ rasops_cmap[j],
+ rasops_cmap[j + 1],
+ rasops_cmap[j + 2]);
+ j += 3;
+ }
switch(depth) {
case 1:
@@ -429,6 +401,30 @@
cgtwelve_select_ovl(sc, CG12_SEL_OVL);
memset(sc->sc_fbaddr, 0, 0x20000);
break;
+ case 8:
+ /* setup the 8bit fb */
+ /*
+ * first clean the 8bit fb - for aesthetic reasons do it while
+ * it's still not visible ( we hope... )
+ */
+ cgtwelve_select_ovl(sc, CG12_SEL_8BIT);
+ memset(sc->sc_int, 0x00, 0x100000);
+
+ /* now write the right thing into the WID plane */
+ cgtwelve_select_ovl(sc, CG12_SEL_WID);
+ memset(sc->sc_wids, 0, 0x100000);
+
+ /* hide the overlay */
+ cgtwelve_select_ovl(sc, CG12_SEL_ENABLE);
+ memset(sc->sc_fbaddr, 0, 0x20000);
+
+ /* now clean the plane */
+ cgtwelve_select_ovl(sc, CG12_SEL_OVL);
+ memset(sc->sc_fbaddr, 0, 0x20000);
+
+ /* and make sure we can write the 24bit fb */
+ cgtwelve_select_ovl(sc, CG12_SEL_8BIT);
+ break;
case 24:
case 32:
/* setup the 24bit fb for X */
@@ -464,21 +460,38 @@
struct cgtwelve_softc *sc = cookie;
struct rasops_info *ri = &scr->scr_ri;
+#ifdef CG12_COLOR
+ ri->ri_depth = 8;
+#else
ri->ri_depth = 1;
+#endif
ri->ri_width = sc->sc_width;
ri->ri_height = sc->sc_height;
ri->ri_stride = sc->sc_stride;
ri->ri_flg = RI_CENTER;
if (sc->sc_shadow == NULL) {
+#ifdef CG12_COLOR
+ ri->ri_bits = sc->sc_int;
+#else
ri->ri_bits = sc->sc_fbaddr;
+#endif
+ scr->scr_flags |= VCONS_DONT_READ;
} else {
+#ifdef CG12_COLOR
+ ri->ri_hwbits = sc->sc_int;
+#else
ri->ri_hwbits = sc->sc_fbaddr;
+#endif
ri->ri_bits = sc->sc_shadow;
}
- rasops_init(ri, ri->ri_height/8, ri->ri_width/8);
+ rasops_init(ri, ri->ri_height / 8, ri->ri_width / 8);
+#ifdef CG12_COLOR
+ ri->ri_caps = WSSCREEN_REVERSE | WSSCREEN_WSCOLORS;
+#else
ri->ri_caps = WSSCREEN_REVERSE;
+#endif
rasops_reconfig(ri, ri->ri_height / ri->ri_font->fontheight,
ri->ri_width / ri->ri_font->fontwidth);
}
@@ -531,7 +544,11 @@
sc->sc_mode = new_mode;
if (new_mode == WSDISPLAYIO_MODE_EMUL)
{
+#ifdef CG12_COLOR
+ cgtwelve_setup(sc, 8);
+#else
cgtwelve_setup(sc, 1);
+#endif
vcons_redraw_screen(ms);
} else {
cgtwelve_setup(sc, 32);
Index: src/sys/dev/sbus/files.sbus
diff -u src/sys/dev/sbus/files.sbus:1.36 src/sys/dev/sbus/files.sbus:1.37
--- src/sys/dev/sbus/files.sbus:1.36 Wed Mar 24 00:33:06 2010
+++ src/sys/dev/sbus/files.sbus Wed Aug 18 21:11:50 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.sbus,v 1.36 2010/03/24 00:33:06 macallan Exp $
+# $NetBSD: files.sbus,v 1.37 2010/08/18 21:11:50 macallan Exp $
#
# Config file and device description for machine-independent SBUS code.
# Included by ports that need it.
@@ -150,7 +150,7 @@
file dev/ic/i128.c agten
# Sun CG12 / Matrox SG3
-defflag opt_cgtwelve.h CG12_DEBUG
+defflag opt_cgtwelve.h CG12_DEBUG CG12_COLOR CG12_SHADOW
device cgtwelve: fb, rasops1, rasops8, wsemuldisplaydev, vcons
attach cgtwelve at sbus
file dev/sbus/cgtwelve.c cgtwelve
