View | Details | Raw Unified | Return to bug 210382 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/vt/hw/fb/vt_fb.c (-2 / +2 lines)
Lines 416-425 Link Here
416
	int err;
416
	int err;
417
	info = vd->vd_softc;
417
	info = vd->vd_softc;
418
	vd->vd_height = MIN(VT_FB_DEFAULT_HEIGHT, info->fb_height);
418
	vd->vd_height = MIN(VT_FB_MAX_HEIGHT, info->fb_height);
419
	margin = (info->fb_height - vd->vd_height) >> 1;
419
	margin = (info->fb_height - vd->vd_height) >> 1;
420
	vd->vd_transpose = margin * info->fb_stride;
420
	vd->vd_transpose = margin * info->fb_stride;
421
	vd->vd_width = MIN(VT_FB_DEFAULT_WIDTH, info->fb_width);
421
	vd->vd_width = MIN(VT_FB_MAX_WIDTH, info->fb_width);
422
	margin = (info->fb_width - vd->vd_width) >> 1;
422
	margin = (info->fb_width - vd->vd_width) >> 1;
423
	vd->vd_transpose += margin * (info->fb_bpp / NBBY);
423
	vd->vd_transpose += margin * (info->fb_bpp / NBBY);
424
	vd->vd_video_dev = info->fb_video_dev;
424
	vd->vd_video_dev = info->fb_video_dev;
(-)sys/dev/vt/vt.h (-5 / +4 lines)
Lines 377-387 Link Here
377
#define	PIXEL_WIDTH(w)	((w) / 8)
377
#define	PIXEL_WIDTH(w)	((w) / 8)
378
#define	PIXEL_HEIGHT(h)	((h) / 16)
378
#define	PIXEL_HEIGHT(h)	((h) / 16)
379
#ifndef VT_FB_DEFAULT_WIDTH
379
#ifndef VT_FB_MAX_WIDTH
380
#define	VT_FB_DEFAULT_WIDTH	2048
380
#define	VT_FB_MAX_WIDTH		4096
381
#endif
381
#endif
382
#ifndef VT_FB_DEFAULT_HEIGHT
382
#ifndef VT_FB_MAX_HEIGHT
383
#define	VT_FB_DEFAULT_HEIGHT	1200
383
#define	VT_FB_MAX_HEIGHT	2400
384
#endif
384
#endif
385
/* name argument is not used yet. */
385
/* name argument is not used yet. */
Lines 460-463 Link Here
460
void vtterm_draw_cpu_logos(struct vt_device *);
460
void vtterm_draw_cpu_logos(struct vt_device *);
461
#endif /* !_DEV_VT_VT_H_ */
461
#endif /* !_DEV_VT_VT_H_ */
462
(-)sys/dev/vt/vt_core.c (-2 / +2 lines)
Lines 181-188 Link Here
181
SET_DECLARE(vt_drv_set, struct vt_driver);
181
SET_DECLARE(vt_drv_set, struct vt_driver);
182
#define	_VTDEFH	MAX(100, PIXEL_HEIGHT(VT_FB_DEFAULT_HEIGHT))
182
#define	_VTDEFH	MAX(100, PIXEL_HEIGHT(VT_FB_MAX_HEIGHT))
183
#define	_VTDEFW	MAX(200, PIXEL_WIDTH(VT_FB_DEFAULT_WIDTH))
183
#define	_VTDEFW	MAX(200, PIXEL_WIDTH(VT_FB_MAX_WIDTH))
184
struct terminal	vt_consterm;
184
struct terminal	vt_consterm;
185
static struct vt_window	vt_conswindow;
185
static struct vt_window	vt_conswindow;

Return to bug 210382