From f41bde667c42f6bd51e6f520ef77b08f803ee725 Mon Sep 17 00:00:00 2001
From: Conrad Meyer <cem@FreeBSD.org>
Date: Tue, 19 Jul 2016 19:20:47 +0000
Subject: [PATCH] Increase vt(4) framebuffer maximum size

And rename "DEFAULT" constants to the more accurate "MAX."

PR:		210382
Submitted by:	Felix <felixphew0 at gmail.com>
Reviewed by:	wblock, cem
Tested by:	Dave Cottlehuber <dch at skunkwerks.at>
---
 share/man/man4/vt.4      | 6 +++---
 sys/dev/vt/hw/fb/vt_fb.c | 4 ++--
 sys/dev/vt/vt.h          | 8 ++++----
 sys/dev/vt/vt_core.c     | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4
index 2349d948251c..adf6ecc1ee21 100644
--- a/share/man/man4/vt.4
+++ b/share/man/man4/vt.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 21, 2016
+.Dd July 19, 2016
 .Dt "VIRTUAL TERMINALS" 4
 .Os
 .Sh NAME
@@ -36,8 +36,8 @@
 .Cd "options VT_MAXWINDOWS=N"
 .Cd "options VT_ALT_TO_ESC_HACK=1"
 .Cd "options VT_TWOBUTTON_MOUSE"
-.Cd "options VT_FB_DEFAULT_WIDTH=X"
-.Cd "options VT_FB_DEFAULT_HEIGHT=Y"
+.Cd "options VT_FB_MAX_WIDTH=X"
+.Cd "options VT_FB_MAX_HEIGHT=Y"
 .Cd "options SC_NO_CUTPASTE"
 .Cd "device vt"
 .Pp
diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c
index 86a22026adf9..1a9bbecd2e35 100644
--- a/sys/dev/vt/hw/fb/vt_fb.c
+++ b/sys/dev/vt/hw/fb/vt_fb.c
@@ -416,10 +416,10 @@ vt_fb_init(struct vt_device *vd)
 	int err;
 
 	info = vd->vd_softc;
-	vd->vd_height = MIN(VT_FB_DEFAULT_HEIGHT, info->fb_height);
+	vd->vd_height = MIN(VT_FB_MAX_HEIGHT, info->fb_height);
 	margin = (info->fb_height - vd->vd_height) >> 1;
 	vd->vd_transpose = margin * info->fb_stride;
-	vd->vd_width = MIN(VT_FB_DEFAULT_WIDTH, info->fb_width);
+	vd->vd_width = MIN(VT_FB_MAX_WIDTH, info->fb_width);
 	margin = (info->fb_width - vd->vd_width) >> 1;
 	vd->vd_transpose += margin * (info->fb_bpp / NBBY);
 	vd->vd_video_dev = info->fb_video_dev;
diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h
index 61e7b82720c6..038e2a479e6e 100644
--- a/sys/dev/vt/vt.h
+++ b/sys/dev/vt/vt.h
@@ -377,11 +377,11 @@ void vt_upgrade(struct vt_device *vd);
 #define	PIXEL_WIDTH(w)	((w) / 8)
 #define	PIXEL_HEIGHT(h)	((h) / 16)
 
-#ifndef VT_FB_DEFAULT_WIDTH
-#define	VT_FB_DEFAULT_WIDTH	2048
+#ifndef VT_FB_MAX_WIDTH
+#define	VT_FB_MAX_WIDTH	4096
 #endif
-#ifndef VT_FB_DEFAULT_HEIGHT
-#define	VT_FB_DEFAULT_HEIGHT	1200
+#ifndef VT_FB_MAX_HEIGHT
+#define	VT_FB_MAX_HEIGHT	2400
 #endif
 
 /* name argument is not used yet. */
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index a90ab9f45adc..32ac08048fea 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -181,8 +181,8 @@ static void vt_resume_handler(void *priv);
 
 SET_DECLARE(vt_drv_set, struct vt_driver);
 
-#define	_VTDEFH	MAX(100, PIXEL_HEIGHT(VT_FB_DEFAULT_HEIGHT))
-#define	_VTDEFW	MAX(200, PIXEL_WIDTH(VT_FB_DEFAULT_WIDTH))
+#define	_VTDEFH	MAX(100, PIXEL_HEIGHT(VT_FB_MAX_HEIGHT))
+#define	_VTDEFW	MAX(200, PIXEL_WIDTH(VT_FB_MAX_WIDTH))
 
 struct terminal	vt_consterm;
 static struct vt_window	vt_conswindow;