svn commit: r210379 - stable/7/sys/dev/syscons

[Jung-uk Kim]

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