diff options
| author | emaste <emaste@FreeBSD.org> | 2017-07-19 13:11:35 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2017-07-19 13:11:35 +0000 |
| commit | 01ab9bb243575b575268cc5f9a75830c00d34be4 (patch) | |
| tree | 5e5af75c2469701654cd604210ba4434bf805851 | |
| parent | 618c9a63f07ddb27c930650f7ab59b5915eb0e73 (diff) | |
| download | FreeBSD-src-01ab9bb243575b575268cc5f9a75830c00d34be4.zip FreeBSD-src-01ab9bb243575b575268cc5f9a75830c00d34be4.tar.gz | |
MFC r303043: Increase vt(4) framebuffer maximum size
PR: 210382
Relnotes: Yes
| -rw-r--r-- | share/man/man4/vt.4 | 6 | ||||
| -rw-r--r-- | sys/dev/vt/hw/fb/vt_fb.c | 4 | ||||
| -rw-r--r-- | sys/dev/vt/vt.h | 8 | ||||
| -rw-r--r-- | 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 86e7ed4..a73c2b5 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -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 diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c index ff36d18..eb21513 100644 --- a/sys/dev/vt/hw/fb/vt_fb.c +++ b/sys/dev/vt/hw/fb/vt_fb.c @@ -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); diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index 8d76992..73cef17 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -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. */ diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index 62b59ba..0a69217 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -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; |
