svn commit: r273104 - releng/10.1/sys/dev/vt

Jean-Sebastien Pedron dumbbell at FreeBSD.org
Tue Oct 14 19:10:01 UTC 2014


Author: dumbbell
Date: Tue Oct 14 19:10:00 2014
New Revision: 273104
URL: https://svnweb.freebsd.org/changeset/base/273104

Log:
  vt(4): Don't recalculate buffer size if we don't know screen size
  
  MF10:	r273037
  MFC:	r272537
  
  When the screen size is unknown, it's set to 0x0. We can't use that as
  the buffer size, otherwise, functions such as vtbuf_fill() will fail.
  
  This fixes a panic on RaspberryPi, where there's no vt(4) backend
  configured early in boot.
  
  PR:		193981
  Tested by:	danilo@
  Approved by:	re (marius)

Modified:
  releng/10.1/sys/dev/vt/vt_core.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/sys/dev/vt/vt_core.c
==============================================================================
--- releng/10.1/sys/dev/vt/vt_core.c	Tue Oct 14 19:01:11 2014	(r273103)
+++ releng/10.1/sys/dev/vt/vt_core.c	Tue Oct 14 19:10:00 2014	(r273104)
@@ -1269,7 +1269,8 @@ vtterm_cnprobe(struct terminal *tm, stru
 	 * that we have the real viewable size, fix it in the static
 	 * buffer.
 	 */
-	vt_termsize(vd, vw->vw_font, &vw->vw_buf.vb_scr_size);
+	if (vd->vd_width != 0 && vd->vd_height != 0)
+		vt_termsize(vd, vw->vw_font, &vw->vw_buf.vb_scr_size);
 
 	vtbuf_init_early(&vw->vw_buf);
 	vt_winsize(vd, vw->vw_font, &wsz);


More information about the svn-src-releng mailing list