[src/trunk]: src/sys/dev/ic set RI_NO_AUTO then attaching early, clear it oth...

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

details:   https://anonhg.NetBSD.org/src/rev/8f6c6e6f2a50
branches:  trunk
changeset: 754795:8f6c6e6f2a50
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed May 12 20:58:52 2010 +0000

description:
set RI_NO_AUTO then attaching early, clear it otherwise

diffstat:

 sys/dev/ic/igsfb.c |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (51 lines):

diff -r 4dcdceab3e54 -r 8f6c6e6f2a50 sys/dev/ic/igsfb.c
--- a/sys/dev/ic/igsfb.c        Wed May 12 19:26:33 2010 +0000
+++ b/sys/dev/ic/igsfb.c        Wed May 12 20:58:52 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: igsfb.c,v 1.48 2009/12/24 19:16:28 elad Exp $ */
+/*     $NetBSD: igsfb.c,v 1.49 2010/05/12 20:58:52 macallan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
  * Integraphics Systems IGA 168x and CyberPro series.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.48 2009/12/24 19:16:28 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.49 2010/05/12 20:58:52 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -279,10 +279,6 @@
                }
        }
 
-       /*
-        * XXX: TODO: make it possible to select the desired video mode.
-        * For now - hardcode to 1024x768/8bpp.  This is what Krups OFW uses.
-        */
        igsfb_hw_setup(dc);
 
        /*
@@ -408,11 +404,17 @@
        struct rasops_info *ri = &scr->scr_ri;
        int wsfcookie;
 
-       if ((scr == &dc->dc_console) && (dc->dc_vd.active != NULL))
-               return;
+       if (scr == &dc->dc_console) {
+               if (ri->ri_flg == 0) {
+                       /* first time, need to set RI_NO_AUTO */
+                       ri->ri_flg |= RI_NO_AUTO;
+               } else {
+                       /* clear it on 2nd run */
+                       ri->ri_flg &= ~RI_NO_AUTO;
+               }
+       }
+       ri->ri_flg |= RI_CENTER | RI_FULLCLEAR;
 
-
-       ri->ri_flg = RI_CENTER | RI_FULLCLEAR;
        if (IGSFB_HW_SOFT_BSWAP(dc))
                ri->ri_flg |= RI_BSWAP;