Module Name: src
Committed By: macallan
Date: Tue Feb 13 13:17:51 UTC 2024
Modified Files:
src/sys/dev/ic: sti.c
Log Message:
in sti_screen_setup() don't bother looking for fonts if STI_FBMODE is requested
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/sti.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/sti.c
diff -u src/sys/dev/ic/sti.c:1.34 src/sys/dev/ic/sti.c:1.35
--- src/sys/dev/ic/sti.c:1.34 Thu Feb 1 06:50:36 2024
+++ src/sys/dev/ic/sti.c Tue Feb 13 13:17:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.34 2024/02/01 06:50:36 skrll Exp $ */
+/* $NetBSD: sti.c,v 1.35 2024/02/13 13:17:51 macallan Exp $ */
/* $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.34 2024/02/01 06:50:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.35 2024/02/13 13:17:51 macallan Exp $");
#include "wsdisplay.h"
@@ -556,6 +556,12 @@ sti_screen_setup(struct sti_screen *scr,
scr->owidth = cfg.owidth;
memcpy(scr->name, cfg.name, sizeof(scr->name));
+ if (flags & STI_FBMODE) {
+ /* we're done here */
+ sti_init(scr, STI_FBMODE);
+ return 0;
+ }
+
if ((error = sti_init(scr, STI_TEXTMODE | flags))) {
aprint_error(": cannot initialize (%d)\n", error);
goto fail;
