From owner-svn-src-head@FreeBSD.ORG  Sat Oct  4 18:40:41 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2A038DC0;
 Sat,  4 Oct 2014 18:40:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BC842679;
 Sat,  4 Oct 2014 18:40:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s94Ieees005485;
 Sat, 4 Oct 2014 18:40:40 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s94IeeQD005484;
 Sat, 4 Oct 2014 18:40:40 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201410041840.s94IeeQD005484@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Sat, 4 Oct 2014 18:40:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272537 - head/sys/dev/vt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Oct 2014 18:40:41 -0000

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);