[src/trunk]: src/sys/dev/pci Always call mach64_init_screen, otherwise we'll ...

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

details:   https://anonhg.NetBSD.org/src/rev/c8a374c71a47
branches:  trunk
changeset: 581349:c8a374c71a47
user:      christos <christos%NetBSD.org@localhost>
date:      Tue May 31 21:17:03 2005 +0000

description:
Always call mach64_init_screen, otherwise we'll panic later if DIAGNOSTIC
when we call switch screen and the machine has a serial console. Thanks to
martin for the fix.

diffstat:

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

diffs (30 lines):

diff -r b8ede7717556 -r c8a374c71a47 sys/dev/pci/machfb.c
--- a/sys/dev/pci/machfb.c      Tue May 31 21:16:06 2005 +0000
+++ b/sys/dev/pci/machfb.c      Tue May 31 21:17:03 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machfb.c,v 1.28 2005/05/31 21:16:06 christos Exp $     */
+/*     $NetBSD: machfb.c,v 1.29 2005/05/31 21:17:03 christos Exp $     */
 
 /*
  * Copyright (c) 2002 Bang Jun-Young
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, 
-       "$NetBSD: machfb.c,v 1.28 2005/05/31 21:16:06 christos Exp $");
+       "$NetBSD: machfb.c,v 1.29 2005/05/31 21:17:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -649,9 +649,9 @@
        /* XXX shouldn't that happen /before/ we call rasops_init()? */
        wsfont_init();
 
+       mach64_init_screen(sc, &mach64_console_screen,
+           &mach64_defaultscreen, 1, &defattr, setmode);
        if (console) {
-               mach64_init_screen(sc, &mach64_console_screen,
-                   &mach64_defaultscreen, 1, &defattr, setmode);
                wsdisplay_cnattach(&mach64_defaultscreen, 
                    &mach64_console_screen.ri, 0, 0, defattr);
        }