[src/trunk]: src/sys/dev/rasops rasops_reconfig: Do not abort even if font st...

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

details:   https://anonhg.NetBSD.org/src/rev/cbc39370020e
branches:  trunk
changeset: 988217:cbc39370020e
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Oct 04 12:26:29 2021 +0000

description:
rasops_reconfig: Do not abort even if font stride is not supported by
rasops_make_box_chars_*() functions; Stop using ri_optfont instead.

XXX
Add rasops_make_box_chars_24().

diffstat:

 sys/dev/rasops/rasops.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r e5bc46971cb0 -r cbc39370020e sys/dev/rasops/rasops.c
--- a/sys/dev/rasops/rasops.c   Mon Oct 04 09:39:18 2021 +0000
+++ b/sys/dev/rasops/rasops.c   Mon Oct 04 12:26:29 2021 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rasops.c,v 1.123 2020/07/02 07:49:44 rin Exp $        */
+/*      $NetBSD: rasops.c,v 1.124 2021/10/04 12:26:29 rin Exp $        */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.123 2020/07/02 07:49:44 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.124 2021/10/04 12:26:29 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_rasops.h"
@@ -376,11 +376,12 @@
                                rasops_make_box_chars_32(ri);
                                break;
                        default:
-                               aprint_error(
+                               kmem_free(ri->ri_optfont.data, len);
+                               ri->ri_optfont.data = NULL;
+                               aprint_verbose(
                                    "%s: font stride assumptions botched",
                                    __func__);
-                               splx(s);
-                               return -1;
+                               break;
                        }
                }
        } else