[src/trunk]: src/sys/dev/pci don't leave a mess on screen when attaching, whi...

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

details:   https://anonhg.NetBSD.org/src/rev/5adf11e14afd
branches:  trunk
changeset: 765020:5adf11e14afd
user:      macallan <macallan%NetBSD.org@localhost>
date:      Mon May 16 00:59:37 2011 +0000

description:
don't leave a mess on screen when attaching, while there use VCONS_DONT_READ
if VCONS_DRAW_INTR is set

diffstat:

 sys/dev/pci/machfb.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r a494b03a14f6 -r 5adf11e14afd sys/dev/pci/machfb.c
--- a/sys/dev/pci/machfb.c      Mon May 16 00:23:20 2011 +0000
+++ b/sys/dev/pci/machfb.c      Mon May 16 00:59:37 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machfb.c,v 1.65 2011/05/10 18:31:33 dyoung Exp $       */
+/*     $NetBSD: machfb.c,v 1.66 2011/05/16 00:59:37 macallan Exp $     */
 
 /*
  * Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, 
-       "$NetBSD: machfb.c,v 1.65 2011/05/10 18:31:33 dyoung Exp $");
+       "$NetBSD: machfb.c,v 1.66 2011/05/16 00:59:37 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -827,8 +827,11 @@
        ri->ri_flg = RI_CENTER;
        set_address(ri, sc->sc_aperture);
 
+#ifdef VCONS_DRAW_INTR
+       scr->scr_flags |= VCONS_DONT_READ;
+#endif
+
        if (existing) {
-               ri->ri_flg |= RI_CLEAR;
                if (setmode && mach64_set_screentype(sc, scr->scr_type)) {
                        panic("%s: failed to switch video mode",
                            device_xname(sc->sc_dev));
@@ -838,7 +841,6 @@
        rasops_init(ri, sc->sc_my_mode->vdisplay / 8,
            sc->sc_my_mode->hdisplay / 8);
        ri->ri_caps = WSSCREEN_WSCOLORS;
-
        rasops_reconfig(ri, sc->sc_my_mode->vdisplay / ri->ri_font->fontheight,
                    sc->sc_my_mode->hdisplay / ri->ri_font->fontwidth);
        
@@ -1119,8 +1121,8 @@
        regw(sc, SC_BOTTOM, sc->sc_my_mode->vdisplay - 1);
        regw(sc, SC_RIGHT, pitch_value - 1);
 
-       regw(sc, DP_BKGD_CLR, 0);
-       regw(sc, DP_FRGD_CLR, 0xffffffff);
+       regw(sc, DP_BKGD_CLR, WS_DEFAULT_BG);
+       regw(sc, DP_FRGD_CLR, WS_DEFAULT_FG);
        regw(sc, DP_WRITE_MASK, 0xffffffff);
        regw(sc, DP_MIX, (MIX_SRC << 16) | MIX_DST);