From owner-dev-commits-src-branches@freebsd.org Wed Feb 24 18:39:03 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 85723565CC3; Wed, 24 Feb 2021 18:39:03 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dm4Sk09Csz4SCZ; Wed, 24 Feb 2021 18:39:02 +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 715BE148E; Wed, 24 Feb 2021 18:39:01 +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 11OId1c9091197; Wed, 24 Feb 2021 18:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11OId1w6091196; Wed, 24 Feb 2021 18:39:01 GMT (envelope-from git) Date: Wed, 24 Feb 2021 18:39:01 GMT Message-Id: <202102241839.11OId1w6091196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Toomas Soome Subject: git: 8305d6906fe9 - releng/13.0 - loader: unload command should reset tg_kernel_supported in gfx_state 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/releng/13.0 X-Git-Reftype: branch X-Git-Commit: 8305d6906fe983ae470184127b5e42cc6f91493a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Feb 2021 18:39:06 -0000 The branch releng/13.0 has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=8305d6906fe983ae470184127b5e42cc6f91493a commit 8305d6906fe983ae470184127b5e42cc6f91493a Author: Toomas Soome AuthorDate: 2021-01-28 07:45:47 +0000 Commit: Toomas Soome CommitDate: 2021-02-23 07:42:26 +0000 loader: unload command should reset tg_kernel_supported in gfx_state While loading kernel, we check if vt/vbe backend support is included in kernel and set the tg_kernel_supported flag in gfx_state. unload command needs to reset this flag to allow next load to perform this check with new kernel. (cherry picked from commit 9b388ac30375ad4e0259b264a006753edcb2bd3c) Reported by: jhb Approved by: re (gjb) --- stand/common/module.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/common/module.c b/stand/common/module.c index 247fc54b6021..34ffc10cded3 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -271,6 +271,8 @@ unload(void) } loadaddr = 0; unsetenv("kernelname"); + /* Reset tg_kernel_supported to allow next load to check it again. */ + gfx_state.tg_kernel_supported = false; } COMMAND_SET(unload, "unload", "unload all modules", command_unload);