From nobody Sun Nov 28 16:37:47 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CB04018B6843; Sun, 28 Nov 2021 16:37:47 +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 4J2Dfz3lcNz3m1H; Sun, 28 Nov 2021 16:37:47 +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 60985120FF; Sun, 28 Nov 2021 16:37:47 +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 1ASGbl8Q013603; Sun, 28 Nov 2021 16:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ASGbl0G013602; Sun, 28 Nov 2021 16:37:47 GMT (envelope-from git) Date: Sun, 28 Nov 2021 16:37:47 GMT Message-Id: <202111281637.1ASGbl0G013602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b8cf1c5c30a5 - main - Remove options VESA from x86 GENERIC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8cf1c5c30a5e6da4e2c9702ffd607a90453fb33 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638117467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPlVPwcgJmESSNHiJGTuhTP0AFfIMzoQMwauIDvYlNk=; b=dZnpCbUNdl/OGKpj9QlcUcb+oLPLDVOLndAgwVREIzdnp9gqnlFowUFo0i/jDX/2sZc+p1 H+QOQXfE51OhqHovEXdYL+oOrja7m33Nqws/L80TRVI4Wr4putXFYFVb8Romu59a9kSg7p z1WuhgwGvVAIUTJavbJ+1AkOJELJOIqBMdF37y0/m2Ubscs34+HrlYmVt4U1BUOQWzu7M8 zE941abJQ4EYJ0GlvOsl8hRJZuXongA6v4HM0fd0QEhaQXWJjuFunKSMpmPg0+jUF0RZx3 bzwalo/rul5zStvEFhOUQ4P24gCEiREZ63RGNUtSWTTXN6ynB+wKVpowhwrpwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638117467; a=rsa-sha256; cv=none; b=Lv2HyIst7OaNI10oM+EiTlOtad6RvMSd5p7bohzKQ7fORsoOf4zcN/jE77cVR2Ci/ud8bU Yc06/F2ji/d4EWZ+l/uaq8mCNlUIIJRDLYzy33WLl/Ot/cfYLKnOClP0TehXfK2Vald8vU eXpwIPPeDmzDZNK3Gb0DccWBtP0/P4jUbR3r9oir4rnweNIYbL4+7Hv4JxoFvXoRf0YTYS jHnWwFNZhppHBEOCnkmZagvlPcNfUe21gqpJsOyJ4C0etP0sjvZ5nCSKOIZprxCpsMDkME Ta/SjLB2fsG1PUthNtfLt4NfC5CVZ+fenadDr45TV6PZdgSP62JGf6JxQuu86Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b8cf1c5c30a5e6da4e2c9702ffd607a90453fb33 commit b8cf1c5c30a5e6da4e2c9702ffd607a90453fb33 Author: Ed Maste AuthorDate: 2021-11-27 20:27:45 +0000 Commit: Ed Maste CommitDate: 2021-11-28 16:29:17 +0000 Remove options VESA from x86 GENERIC options VESA / vesa.ko provides VESA Bios Extensions (VBE) support for the legacy sc(4) console. It is not used by the default console, vt(4). There is a report[1] of an incompatibility between VESA and the Nvidia driver breaking suspend/resume. Since VESA is not used by the default configuration anyway, just remove options VESA from GENERIC. The kernel module is still available and may be loaded by sc(4) users who want to select a VBE mode. (Note that vt(4) does not support selecting a VBE mode. The loader can set a VBE mode and vt(4) will use it via the vt_vbefb driver.) [1] https://lists.freebsd.org/archives/freebsd-hackers/2021-November/000469.html PR: 253733 Reported by: Stefan Blachmann [1] Reviewed by: imp, manu, tsoome Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33141 --- sys/amd64/conf/GENERIC | 1 - sys/i386/conf/GENERIC | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 2732569c461c..edd7ae6419d2 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -213,7 +213,6 @@ device psm # PS/2 mouse device kbdmux # keyboard multiplexer device vga # VGA video card driver -options VESA # Add support for VESA BIOS Extensions (VBE) device splash # Splash screen and screen saver support diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index e3f1aee8c723..26bdf4a53ed0 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -182,7 +182,6 @@ device psm # PS/2 mouse device kbdmux # keyboard multiplexer device vga # VGA video card driver -options VESA # Add support for VESA BIOS Extensions (VBE) device splash # Splash screen and screen saver support