d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase vt(4) framebuffer maximum size

Browse Source 
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>
This commit is contained in:
Conrad Meyer 2016-07-19 19:20:47 +00:00
parent 3c79101150
commit f41bde667c
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/man/man4/vt.4
View File

@ -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

4
sys/dev/vt/hw/fb/vt_fb.c
View File

@ -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;

8
sys/dev/vt/vt.h
View File

@ -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. */

4
sys/dev/vt/vt_core.c
View File

@ -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;