From a9edf8145e1871dd325d936a01b72b1482a2fa91 Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@NetBSD.org>
Date: Sat, 15 May 2010 08:53:26 +0000
Subject: [PATCH] Clear RI_NO_AUTO in actual attach functions during
 autoconf(9) for console devices that set the flag during consinit().

---
 sys/arch/dreamcast/dev/pvr.c         | 5 +++--
 sys/arch/evbppc/explora/dev/fb_elb.c | 5 +++--
 sys/arch/ews4800mips/sbd/fb_sbdio.c  | 5 +++--
 sys/dev/hpc/hpcfb.c                  | 5 +++--
 sys/dev/pci/tga.c                    | 5 +++--
 sys/dev/tc/cfb.c                     | 5 +++--
 sys/dev/tc/mfb.c                     | 5 +++--
 sys/dev/tc/sfb.c                     | 5 +++--
 sys/dev/tc/sfbplus.c                 | 5 +++--
 sys/dev/tc/tfb.c                     | 5 +++--
 sys/dev/tc/xcfb.c                    | 5 +++--
 11 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/sys/arch/dreamcast/dev/pvr.c b/sys/arch/dreamcast/dev/pvr.c
index 0d77405c0045..def09e18682c 100644
--- a/sys/arch/dreamcast/dev/pvr.c
+++ b/sys/arch/dreamcast/dev/pvr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pvr.c,v 1.26 2010/05/15 06:48:22 tsutsui Exp $	*/
+/*	$NetBSD: pvr.c,v 1.27 2010/05/15 08:53:27 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.26 2010/05/15 06:48:22 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pvr.c,v 1.27 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -289,6 +289,7 @@ pvr_attach(struct device *parent, struct device *self, void *aux)
 	console = pvr_is_console;
 	if (console) {
 		sc->sc_dc = &pvr_console_dc;
+		sc->sc_dc->rinfo.ri_flg &= ~RI_NO_AUTO;
 		sc->nscreens = 1;
 	} else {
 		sc->sc_dc = malloc(sizeof(struct fb_devconfig), M_DEVBUF,
diff --git a/sys/arch/evbppc/explora/dev/fb_elb.c b/sys/arch/evbppc/explora/dev/fb_elb.c
index dd7cfe2df04d..dff1f25d098c 100644
--- a/sys/arch/evbppc/explora/dev/fb_elb.c
+++ b/sys/arch/evbppc/explora/dev/fb_elb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fb_elb.c,v 1.10 2010/05/15 07:38:24 tsutsui Exp $	*/
+/*	$NetBSD: fb_elb.c,v 1.11 2010/05/15 08:53:26 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.10 2010/05/15 07:38:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1.11 2010/05/15 08:53:26 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -139,6 +139,7 @@ fb_elb_attach(struct device *parent, struct device *self, void *aux)
 
 	if (is_console) {
 		sc->sc_fb = &console_dev;
+		sc->sc_fb->fb_ri.ri_flg &= ~RI_NO_AUTO;
 	} else {
 		sc->sc_fb = malloc(sizeof(struct fb_dev), M_DEVBUF, M_WAITOK);
 		memset(sc->sc_fb, 0, sizeof(struct fb_dev));
diff --git a/sys/arch/ews4800mips/sbd/fb_sbdio.c b/sys/arch/ews4800mips/sbd/fb_sbdio.c
index 712d788190e7..76a49aed60cb 100644
--- a/sys/arch/ews4800mips/sbd/fb_sbdio.c
+++ b/sys/arch/ews4800mips/sbd/fb_sbdio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fb_sbdio.c,v 1.9 2010/05/15 06:39:06 tsutsui Exp $	*/
+/*	$NetBSD: fb_sbdio.c,v 1.10 2010/05/15 08:53:27 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #define WIRED_FB_TLB
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.9 2010/05/15 06:39:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.10 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -141,6 +141,7 @@ fb_sbdio_attach(device_t parent, device_t self, void *aux)
 	if (console) {
 		/* already initialized in fb_cnattach() */
 		sc->sc_ri = ri = &fb_console_ri;
+		ri->ri_flg &= ~RI_NO_AUTO;
 		sc->sc_ga = &fb_console_ga;
 		sc->sc_nscreens = 1;
 	} else {
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c
index d4fd43475f0c..086150a40128 100644
--- a/sys/dev/hpc/hpcfb.c
+++ b/sys/dev/hpc/hpcfb.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $	*/
+/*	$NetBSD: hpcfb.c,v 1.55 2010/05/15 08:53:27 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.55 2010/05/15 08:53:27 tsutsui Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_hpcfb.h"
@@ -305,6 +305,7 @@ hpcfbattach(device_t parent, device_t self, void *aux)
 
 	if (hpcfbconsole) {
 		sc->sc_dc = &hpcfb_console_dc;
+		sc->sc_dc->dc_rinfo.ri_flg &= ~RI_NO_AUTO;
 		hpcfb_console_dc.dc_sc = sc;
 		printf(": %dx%d pixels, %d colors, %dx%d chars",
 		    sc->sc_dc->dc_rinfo.ri_width,sc->sc_dc->dc_rinfo.ri_height,
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index 64715ddaef88..6173bf08de49 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.78 2010/05/15 06:38:34 tsutsui Exp $ */
+/* $NetBSD: tga.c,v 1.79 2010/05/15 08:53:27 tsutsui Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.78 2010/05/15 06:38:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.79 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -404,6 +404,7 @@ tgaattach(device_t parent, device_t self, void *aux)
 #endif
 	if (console) {
 		sc->sc_dc = &tga_console_dc;
+		sc->sc_dc->dc_rinfo.ri_flg &= ~RI_NO_AUTO;
 		sc->nscreens = 1;
 	} else {
 		sc->sc_dc = malloc(sizeof(struct tga_devconfig), M_DEVBUF,
diff --git a/sys/dev/tc/cfb.c b/sys/dev/tc/cfb.c
index 743e6f6e4d83..fa11007a1f92 100644
--- a/sys/dev/tc/cfb.c
+++ b/sys/dev/tc/cfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: cfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -255,6 +255,7 @@ cfbattach(device_t parent, device_t self, void *aux)
 	console = (ta->ta_addr == cfb_consaddr);
 	if (console) {
 		sc->sc_ri = ri = &cfb_console_ri;
+		ri->ri_flg &= ~RI_NO_AUTO;
 		sc->nscreens = 1;
 	}
 	else {
diff --git a/sys/dev/tc/mfb.c b/sys/dev/tc/mfb.c
index 13a398b2ddb2..e66fe9454bd5 100644
--- a/sys/dev/tc/mfb.c
+++ b/sys/dev/tc/mfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.55 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: mfb.c,v 1.56 2010/05/15 08:53:27 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.55 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.56 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -234,6 +234,7 @@ mfbattach(device_t parent, device_t self, void *aux)
 	console = (ta->ta_addr == mfb_consaddr);
 	if (console) {
 		sc->sc_ri = ri = &mfb_console_ri;
+		ri->ri_flg &= ~RI_NO_AUTO;
 		sc->nscreens = 1;
 	}
 	else {
diff --git a/sys/dev/tc/sfb.c b/sys/dev/tc/sfb.c
index 78a4323cebf3..8dec624fdf2a 100644
--- a/sys/dev/tc/sfb.c
+++ b/sys/dev/tc/sfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.81 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: sfb.c,v 1.82 2010/05/15 08:53:27 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.81 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.82 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -268,6 +268,7 @@ sfbattach(device_t parent, device_t self, void *aux)
 	console = (ta->ta_addr == sfb_consaddr);
 	if (console) {
 		sc->sc_ri = ri = &sfb_console_ri;
+		ri->ri_flg &= ~RI_NO_AUTO;
 		sc->nscreens = 1;
 	}
 	else {
diff --git a/sys/dev/tc/sfbplus.c b/sys/dev/tc/sfbplus.c
index 46f9d794a8b7..78d2b9258fc7 100644
--- a/sys/dev/tc/sfbplus.c
+++ b/sys/dev/tc/sfbplus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.34 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: sfbplus.c,v 1.35 2010/05/15 08:53:27 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.34 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.35 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -260,6 +260,7 @@ sfbpattach(device_t parent, device_t self, void *aux)
 	console = (ta->ta_addr == sfbp_consaddr);
 	if (console) {
 		sc->sc_ri = ri = &sfbp_console_ri;
+		ri->ri_flg &= ~RI_NO_AUTO;
 		sc->nscreens = 1;
 	}
 	else {
diff --git a/sys/dev/tc/tfb.c b/sys/dev/tc/tfb.c
index eb75eb7d7f60..3737a67125c8 100644
--- a/sys/dev/tc/tfb.c
+++ b/sys/dev/tc/tfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: tfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.59 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -289,6 +289,7 @@ tfbattach(device_t parent, device_t self, void *aux)
 	console = (ta->ta_addr == tfb_consaddr);
 	if (console) {
 		sc->sc_ri = ri = &tfb_console_ri;
+		ri->ri_flg &= ~RI_NO_AUTO;
 		sc->nscreens = 1;
 	}
 	else {
diff --git a/sys/dev/tc/xcfb.c b/sys/dev/tc/xcfb.c
index 7c1354426f1c..24c5549785d0 100644
--- a/sys/dev/tc/xcfb.c
+++ b/sys/dev/tc/xcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.52 2010/05/15 07:01:37 tsutsui Exp $ */
+/* $NetBSD: xcfb.c,v 1.53 2010/05/15 08:53:27 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.52 2010/05/15 07:01:37 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.53 2010/05/15 08:53:27 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -223,6 +223,7 @@ xcfbattach(device_t parent, device_t self, void *aux)
 	console = (ta->ta_addr == xcfb_consaddr);
 	if (console) {
 		sc->sc_ri = ri = &xcfb_console_ri;
+		ri->ri_flg &= ~RI_NO_AUTO;
 		sc->nscreens = 1;
 	}
 	else {