From owner-svn-src-stable@FreeBSD.ORG  Thu Jul 22 17:02:52 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 17A821065675;
	Thu, 22 Jul 2010 17:02:52 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 05ACE8FC15;
	Thu, 22 Jul 2010 17:02:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6MH2p33006416;
	Thu, 22 Jul 2010 17:02:51 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6MH2pBC006415;
	Thu, 22 Jul 2010 17:02:51 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201007221702.o6MH2pBC006415@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 22 Jul 2010 17:02:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210379 - stable/7/sys/dev/syscons
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jul 2010 17:02:52 -0000

Author: jkim
Date: Thu Jul 22 17:02:51 2010
New Revision: 210379
URL: http://svn.freebsd.org/changeset/base/210379

Log:
  MFC:	r210248
  
  Fix two long-standing line wrapping bugs in VGA renderer for pixel mode.
  Font size may be smaller than 16 and logical scan line may be larger than
  the displayed scan line.

Modified:
  stable/7/sys/dev/syscons/scvgarndr.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/syscons/scvgarndr.c
==============================================================================
--- stable/7/sys/dev/syscons/scvgarndr.c	Thu Jul 22 17:02:11 2010	(r210378)
+++ stable/7/sys/dev/syscons/scvgarndr.c	Thu Jul 22 17:02:51 2010	(r210379)
@@ -758,8 +758,9 @@ vga_vgadraw_direct(scr_stat *scp, int fr
 		d += 8 * pixel_size;
 
 		if ((i % scp->xsize) == scp->xsize - 1)
-			d += scp->xoff * 16 * pixel_size +
-			     (scp->font_size - 1) * line_width;
+			d += scp->xoff * scp->font_size * pixel_size +
+			    scp->font_size * line_width -
+			    scp->xpixel * pixel_size;
 	}
 }