From owner-dev-commits-src-all@freebsd.org Mon Jan 4 22:52:21 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0BB544CF9F6; Mon, 4 Jan 2021 22:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8rVX6zQ0z4dMK; Mon, 4 Jan 2021 22:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E24CE22007; Mon, 4 Jan 2021 22:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 104MqKV4041945; Mon, 4 Jan 2021 22:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 104MqKTx041944; Mon, 4 Jan 2021 22:52:20 GMT (envelope-from git) Date: Mon, 4 Jan 2021 22:52:20 GMT Message-Id: <202101042252.104MqKTx041944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: 58661b3ba9eb - main - loader: only use vidc_install_font() with vga controller MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58661b3ba9ebe82f889cbc336afe618ad7f7940a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 22:52:21 -0000 The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=58661b3ba9ebe82f889cbc336afe618ad7f7940a commit 58661b3ba9ebe82f889cbc336afe618ad7f7940a Author: Toomas Soome AuthorDate: 2021-01-04 22:43:39 +0000 Commit: Toomas Soome CommitDate: 2021-01-04 22:49:18 +0000 loader: only use vidc_install_font() with vga controller If the controller does not support VGA, we should not touch VGA registers. --- stand/i386/libi386/vbe.c | 12 ++++++++++++ stand/i386/libi386/vbe.h | 1 + stand/i386/libi386/vidconsole.c | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/stand/i386/libi386/vbe.c b/stand/i386/libi386/vbe.c index 7681eb633b85..232f13dab077 100644 --- a/stand/i386/libi386/vbe.c +++ b/stand/i386/libi386/vbe.c @@ -226,6 +226,18 @@ vga_set_grc(int reg, int i, int v) vga_set_indexed(reg, VGA_GC_ADDRESS, VGA_GC_DATA, i, v); } +/* + * Return true when this controller is VGA compatible. + */ +bool +vbe_is_vga(void) +{ + if (vbe == NULL) + return (false); + + return ((vbe->Capabilities & VBE_CAP_NONVGA) == 0); +} + /* Actually assuming mode 3. */ void bios_set_text_mode(int mode) diff --git a/stand/i386/libi386/vbe.h b/stand/i386/libi386/vbe.h index ff28b960df9c..79574349baee 100644 --- a/stand/i386/libi386/vbe.h +++ b/stand/i386/libi386/vbe.h @@ -152,6 +152,7 @@ int vga_get_grc(int, int); void vga_set_grc(int, int, int); /* high-level VBE helpers, from vbe.c */ +bool vbe_is_vga(void); void bios_set_text_mode(int); int biosvbe_palette_format(int *); void vbe_init(void); diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c index c0da698d2d96..e373bc638ee4 100644 --- a/stand/i386/libi386/vidconsole.c +++ b/stand/i386/libi386/vidconsole.c @@ -780,6 +780,10 @@ vidc_install_font(void) int bpc, f_offset; teken_attr_t a = { 0 }; + /* We can only program VGA registers. */ + if (!vbe_is_vga()) + return; + if (gfx_state.tg_fb_type != FB_TEXT) return;