Author: emaste
Date: Wed Jul 19 13:11:35 2017
New Revision: 321198
URL: https://svnweb.freebsd.org/changeset/base/321198
Log:
MFC r303043: Increase vt(4) framebuffer maximum size
PR: 210382
Relnotes: Yes
Modified:
stable/10/share/man/man4/vt.4
stable/10/sys/dev/vt/hw/fb/vt_fb.c
stable/10/sys/dev/vt/vt.h
stable/10/sys/dev/vt/vt_core.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/share/man/man4/vt.4
==============================================================================
--- stable/10/share/man/man4/vt.4 Wed Jul 19 12:27:40 2017
(r321197)
+++ stable/10/share/man/man4/vt.4 Wed Jul 19 13:11:35 2017
(r321198)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 17, 2016
+.Dd July 19, 2017
.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
Modified: stable/10/sys/dev/vt/hw/fb/vt_fb.c
==============================================================================
--- stable/10/sys/dev/vt/hw/fb/vt_fb.c Wed Jul 19 12:27:40 2017
(r321197)
+++ stable/10/sys/dev/vt/hw/fb/vt_fb.c Wed Jul 19 13:11:35 2017
(r321198)
@@ -402,10 +402,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);
Modified: stable/10/sys/dev/vt/vt.h
==============================================================================
--- stable/10/sys/dev/vt/vt.h Wed Jul 19 12:27:40 2017 (r321197)
+++ stable/10/sys/dev/vt/vt.h Wed Jul 19 13:11:35 2017 (r321198)
@@ -365,11 +365,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. */
Modified: stable/10/sys/dev/vt/vt_core.c
==============================================================================
--- stable/10/sys/dev/vt/vt_core.c Wed Jul 19 12:27:40 2017
(r321197)
+++ stable/10/sys/dev/vt/vt_core.c Wed Jul 19 13:11:35 2017
(r321198)
@@ -172,8 +172,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))
static struct terminal vt_consterm;
static struct vt_window vt_conswindow;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
