The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7edbf69b79c13debff251e6edfee1f57eeac3a6b
commit 7edbf69b79c13debff251e6edfee1f57eeac3a6b
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2024-01-23 14:20:27 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2024-01-23 14:20:27 +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
---
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",
