From nobody Thu Feb 01 17:46:27 2024 X-Original-To: dev-commits-src-branches@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 4TQmYJ38vPz58KLd; Thu, 1 Feb 2024 17:46:28 +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 4TQmYJ1XqTz468j; Thu, 1 Feb 2024 17:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706809588; 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=qSy5T+DB8hcvr4lMsapzkTi1/0f21g4HLA+d3W+aEq0=; b=rjPG2rhkiqEPYKVKgpUB1KIUjTnBEIXG4d3OuCQEYoLKBJbJ+vBHFj3Z9kZIbCNBg/Enum 83tWYdpcNJABbGX4ZKb96PCLMF72KSjUU482m0xKRdr35YKqvt+dS/KH3mLxLbkghsrSaO PW79dWrIpPNqF3m0cU5b5lDW/dPO8lBZ8TWWsQpKxgeVCBcIeAubIbTzzk4RTipLSZosvx VMdTdiHjYdc2injQ+3pjKwjBbGiYYM7hWiqPAJzEhjsRfZ+LcO8IdpXBRKG7iXgfLxbkZP X4fnEyDkmisOnN26+FDJylEGLtFWILxHeEvJ2Vx8F8o3Xr/lBAZyOFSccxKTCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706809588; 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=qSy5T+DB8hcvr4lMsapzkTi1/0f21g4HLA+d3W+aEq0=; b=tXAYRMlopxl+Ivif3vTFScQtob5wUBD4uf3M8L8tG6bjiEmUxE0z+Jqx9li6r2HuoMyud1 3OlBGtaZ6i4OqLk7zFFms/bJiJ08Iowm+iFeTEA2oS4SL64jTZ8VWp4qRpjgSFqqC8njK2 oQBx1nn/av8J8SrJ9bsqxN+MiLGoxC5TKe65k3gFENh03+STNBHYtQ0mwqJd7/CFfEYSDB QJHFNvyDTgC49QCy1HfvZR+6wQcj+C22xtBwiLu3NnXUDxJjbFg4L5BtuzDli9EMbHkEG/ NkaeC/T0Sev++2htIsahdnkbDQ+Qy3zR5Enx2q367TnGMJSwFQH6Z6QFAQeHUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706809588; a=rsa-sha256; cv=none; b=FTlWpKxNygzLk6rd+7g/di0h/AFk94Jb79dpbBwntou+FSyT9JlDJsXimieLVLFrlA1jlZ onu6uaxwE5DAqepqmhlM5rHgx6aqwQVtDqL82eEh/vwGs2XypP6upupz7dlJm+lZ2/itQd pjZAqr8d24B2TuFABQ91FrYtAsGfK9KuJqWuI9/PMXkPQx5mZ81F4oDiPt03gECDz8DAMm dAehHokdPlgqdLqrG53vBOvT63S+Iw3IhIEPJgqQbyWdMhu1SZHXIpuEafW27PcWP7eori fNtBJz/uiprexYlbKNbL+PDrbiR+8NHTqwz8Zw46Bjdqk4u2EKL6pnnJPwv7Eg== 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 4TQmYH71Kxz1BXr; Thu, 1 Feb 2024 17:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 411HkRTl099877; Thu, 1 Feb 2024 17:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411HkRRg099874; Thu, 1 Feb 2024 17:46:27 GMT (envelope-from git) Date: Thu, 1 Feb 2024 17:46:27 GMT Message-Id: <202402011746.411HkRRg099874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3a9cb4da4e75 - stable/14 - stand: Add 1440p to the list of known resolutions. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a9cb4da4e7539b700c805c8c4ca0f1d3f4dff2e Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3a9cb4da4e7539b700c805c8c4ca0f1d3f4dff2e commit 3a9cb4da4e7539b700c805c8c4ca0f1d3f4dff2e Author: Dag-Erling Smørgrav AuthorDate: 2024-01-23 14:20:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-01 17:43:25 +0000 stand: Add 1440p to the list of known resolutions. MFC after: 1 week Reviewed by: manu, kevans, imp Differential Revision: https://reviews.freebsd.org/D43391 (cherry picked from commit 7edbf69b79c13debff251e6edfee1f57eeac3a6b) --- stand/defaults/loader.conf | 2 +- stand/defaults/loader.conf.5 | 3 ++- stand/efi/loader/framebuffer.c | 5 +++++ stand/i386/libi386/vbe.c | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index 08406aa43bc8..e0062bbc8149 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -95,7 +95,7 @@ audit_event_type="etc_security_audit_event" bootenv_autolist="YES" # Auto populate the list of ZFS Boot Environments #beastie_disable="NO" # Turn the beastie boot menu on and off efi_max_resolution="1x1" # Set the max resolution for EFI loader to use: - # 480p, 720p, 1080p, 2160p/4k, 5k, or specify + # 480p, 720p, 1080p, 1440p, 2160p/4k, 5k, or # WidthxHeight (e.g. 1920x1080) #kernels="kernel kernel.old" # Kernels to display in the boot menu kernels_autodetect="YES" # Auto-detect kernel directories in /boot diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 8b7508c8a5b2..42e5712d93b8 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -21,7 +21,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.Dd December 20, 2023 +.Dd January 10, 2024 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -315,6 +315,7 @@ The following values are accepted: .It 480p Ta 640x480 .It 720p Ta 1280x720 .It 1080p Ta 1920x1080 +.It 1440p Ta 2560x1440 .It 2160p Ta 3840x2160 .It 4k Ta 3840x2160 .It 5k Ta 5120x2880 diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c index b8e61dc73acf..56693187b576 100644 --- a/stand/efi/loader/framebuffer.c +++ b/stand/efi/loader/framebuffer.c @@ -77,6 +77,11 @@ static struct named_resolution { .width = 1920, .height = 1080, }, + { + .name = "1440p", + .width = 2560, + .height = 1440, + }, { .name = "2160p", .alias = "4k", diff --git a/stand/i386/libi386/vbe.c b/stand/i386/libi386/vbe.c index 8fbfaa9a3475..61339a1e7911 100644 --- a/stand/i386/libi386/vbe.c +++ b/stand/i386/libi386/vbe.c @@ -84,6 +84,11 @@ static struct named_resolution { .width = 1920, .height = 1080, }, + { + .name = "1440p", + .width = 2560, + .height = 1440, + }, { .name = "2160p", .alias = "4k",