svn commit: r303043 - in head: share/man/man4 sys/dev/vt sys/dev/vt/hw/fb

[Kubilay Kocak]

On 20/07/2016 5:20 AM, Conrad E. Meyer wrote:
> Author: cem
> Date: Tue Jul 19 19:20:47 2016
> New Revision: 303043
> URL: https://svnweb.freebsd.org/changeset/base/303043
> 
> Log:
>   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>

Can MFC?

There are high hopes for this coming out in 11.0 / next 10.x

re is cc'd on the original bugzilla issue

> Modified:
>   head/share/man/man4/vt.4
>   head/sys/dev/vt/hw/fb/vt_fb.c
>   head/sys/dev/vt/vt.h
>   head/sys/dev/vt/vt_core.c
> 
> Modified: head/share/man/man4/vt.4
> ==============================================================================
> --- head/share/man/man4/vt.4	Tue Jul 19 19:19:03 2016	(r303042)
> +++ head/share/man/man4/vt.4	Tue Jul 19 19:20:47 2016	(r303043)
> @@ -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
> 
> Modified: head/sys/dev/vt/hw/fb/vt_fb.c
> ==============================================================================
> --- head/sys/dev/vt/hw/fb/vt_fb.c	Tue Jul 19 19:19:03 2016	(r303042)
> +++ head/sys/dev/vt/hw/fb/vt_fb.c	Tue Jul 19 19:20:47 2016	(r303043)
> @@ -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;
> 
> Modified: head/sys/dev/vt/vt.h
> ==============================================================================
> --- head/sys/dev/vt/vt.h	Tue Jul 19 19:19:03 2016	(r303042)
> +++ head/sys/dev/vt/vt.h	Tue Jul 19 19:20:47 2016	(r303043)
> @@ -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. */
> 
> Modified: head/sys/dev/vt/vt_core.c
> ==============================================================================
> --- head/sys/dev/vt/vt_core.c	Tue Jul 19 19:19:03 2016	(r303042)
> +++ head/sys/dev/vt/vt_core.c	Tue Jul 19 19:20:47 2016	(r303043)
> @@ -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;
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"
>