Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Oct 2014 18:40:40 +0000 (UTC)
From:      Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r272537 - head/sys/dev/vt
Message-ID:  <201410041840.s94IeeQD005484@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dumbbell
Date: Sat Oct  4 18:40:40 2014
New Revision: 272537
URL: https://svnweb.freebsd.org/changeset/base/272537

Log:
  vt(4): Don't recalculate buffer size if we don't know screen size
  
  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@
  MFC after:	3 days

Modified:
  head/sys/dev/vt/vt_core.c

Modified: head/sys/dev/vt/vt_core.c
==============================================================================
--- head/sys/dev/vt/vt_core.c	Sat Oct  4 18:38:14 2014	(r272536)
+++ head/sys/dev/vt/vt_core.c	Sat Oct  4 18:40:40 2014	(r272537)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410041840.s94IeeQD005484>