aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2024-01-23 14:20:27 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2024-02-01 17:46:13 +0000
commit6ef4fc44f96263b2e334aa0a58de8fefb2d15a8d (patch)
treeb4022cb22a30078a14770b5a3672e5017fee6f47
parent5d7b049f99047f73d52a1319c5f062fc62d3fc95 (diff)
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)
-rw-r--r--stand/defaults/loader.conf2
-rw-r--r--stand/defaults/loader.conf.53
-rw-r--r--stand/efi/loader/framebuffer.c5
-rw-r--r--stand/i386/libi386/vbe.c5
4 files changed, 13 insertions, 2 deletions
diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf
index 3c7dab540c9c..1f820eaaec46 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 229bd2b27132..bb40df0333cf 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
@@ -78,6 +78,11 @@ static struct named_resolution {
.height = 1080,
},
{
+ .name = "1440p",
+ .width = 2560,
+ .height = 1440,
+ },
+ {
.name = "2160p",
.alias = "4k",
.width = 3840,
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
@@ -85,6 +85,11 @@ static struct named_resolution {
.height = 1080,
},
{
+ .name = "1440p",
+ .width = 2560,
+ .height = 1440,
+ },
+ {
.name = "2160p",
.alias = "4k",
.width = 3840,