summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2010-05-15 06:01:12 +0000
committertsutsui <tsutsui@NetBSD.org>2010-05-15 06:01:12 +0000
commit67dfc8da50c4074c6d5d867ea5fec76297f84ddc (patch)
treeee96e525868172a8d50978f9402d55078fd39bcf /sys/dev
parent4f56b41e327805b16a6740882e9646b8a4c5d0fc (diff)
Set RI_NO_AUTO in ri->ri_flg if hpcfb_init() is invoked from cnattach.
Fixes silent hang on hpcsh and hpcmips. XXX: all other rasops based console devices need to set this flag??
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/hpc/hpcfb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c
index fa3d4595141..d4fd43475f0 100644
--- a/sys/dev/hpc/hpcfb.c
+++ b/sys/dev/hpc/hpcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.53 2010/02/24 22:37:57 dyoung Exp $ */
+/* $NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.53 2010/02/24 22:37:57 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -451,6 +451,9 @@ hpcfb_init(struct hpcfb_fbconf *fbconf, struct hpcfb_devconfig *dc)
#else
ri->ri_flg = RI_CURSOR;
#endif
+ if (dc == &hpcfb_console_dc)
+ ri->ri_flg |= RI_NO_AUTO;
+
switch (ri->ri_depth) {
case 8:
if (32 <= fbconf->hf_pack_width &&