Toomas, I had more success with this patch, applied on top of 7beeacb27b27 (in other words: call vbe_is_vga() from cons_update_mode() instead of vidc_install_font() ): diff --git a/stand/i386/libi386/vbe.c b/stand/i386/libi386/vbe.c index 7681eb633b8..1fee4f040f4 100644 --- a/stand/i386/libi386/vbe.c +++ b/stand/i386/libi386/vbe.c _at__at_ -1105,6 +1105,15 _at__at_ vbe_default_mode(void) return (modenum); } +bool +vbe_is_vga(void) +{ + if (vbe == NULL) + return (false); + + return ((vbe->Capabilities & VBE_CAP_NONVGA) == 0); +} + COMMAND_SET(vbe, "vbe", "vesa framebuffer mode management", command_vesa); int diff --git a/stand/i386/libi386/vbe.h b/stand/i386/libi386/vbe.h index ff28b960df9..7d07d9ee518 100644 --- a/stand/i386/libi386/vbe.h +++ b/stand/i386/libi386/vbe.h _at__at_ -161,3 +161,4 _at__at_ int vbe_set_mode(int); int vbe_get_mode(void); int vbe_set_palette(const struct paletteentry *, size_t); void vbe_modelist(int); +bool vbe_is_vga(void); diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c index b4829db1ea4..22708032a49 100644 --- a/stand/i386/libi386/vidconsole.c +++ b/stand/i386/libi386/vidconsole.c _at__at_ -907,7 +907,8 _at__at_ cons_update_mode(bool use_gfx_mode) unsetenv("screen.width"); unsetenv("screen.depth"); unsetenv("kern.vt.fb.default_mode"); - vidc_install_font(); + if (!vbe_is_vga()) + vidc_install_font(); } free(screen_buffer); Op ma 4 jan. 2021 om 23:59 schreef Toomas Soome <tsoome_at_me.com>: > > > > > On 4. Jan 2021, at 18:30, Toomas Soome <tsoome_at_me.com> wrote: > > > > > > > >> On 4. Jan 2021, at 18:22, John Kennedy <warlock_at_phouka.net> wrote: > >> > >> This is a little weird. > >> > >> Somewhere between 13.0-g2ff66a915526 (Dec 30th) and -gd03fd8ede2c4 (Dec 29th), > >> I've lost the screen in the boot loader. This is really weird because I > >> didn't update the boot loader (in quite a while, actually), but I suppose it > >> might drag some stuff off of the disk and misbehave. > >> > >> But the system boots, presumably after the countdown that I can't see, I just > >> have to SSH in from a different machine to tweak things. Just no screen at > >> all past the GELI encrypted disk password prompt (and some usual noise as > >> it complains about some padding that I've seen forever). > >> > >> I used to just upgrade the boot loader around ZFS upgrades, and I haven't > >> done that since OpenZFS got merged. I just got overly conservative there > >> and may have missed the "all clear" for all combinations of ZFS and the > >> bootloader recognizing them. > >> > >> The git logs in /usr/src aren't time-sequential, so maybe I shouldn't trust > >> those dates above (I pulled it ~Jan 3rd and let it compile overnight), but > >> I'm going to repull all the sources and recompile, just in case. I might > >> have initiall pulled it during the git conversion and maybe it is confused. > >> > > > > hi! > > > > Yes, it is known defect, and I’m searching for cause; the issue is with /boot/loader and BIOS text mode (unfortunately I have the usual ‘but it is working for me’ case). For workaround, you can try to either: 1 (blind) press esc to get out of boot menu, then enter: vbe on; another option is to add hw.vga.textmode=“0” to loader.conf. > > > > Sorry for confusion, > > toomas > > > > the 58661b3ba9eb should hopefully fix the loader text mode issue, it would be cool if you can verify:) > > thanks, > toomas > _______________________________________________ > freebsd-current_at_freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe_at_freebsd.org"Received on Tue Jan 05 2021 - 00:58:15 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:26 UTC