CVS commit: src/sys/dev/rasops

[Michael Lorenz]

Module Name:    src
Committed By:   macallan
Date:           Wed Jan 25 16:38:27 UTC 2012

Modified Files:
        src/sys/dev/rasops: rasops8.c

Log Message:
rasops8_putchar_aa():
render glyphs scanline by scanline into a 64bit-aligned buffer, then memcpy()
it into video memory instead of writing directly.
This gives >10% speedup even on valkyriefb, likely more on PCIe framebuffers.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/rasops/rasops8.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/rasops/rasops8.c
diff -u src/sys/dev/rasops/rasops8.c:1.30 src/sys/dev/rasops/rasops8.c:1.31
--- src/sys/dev/rasops/rasops8.c:1.30	Wed Jan  4 20:16:20 2012
+++ src/sys/dev/rasops/rasops8.c	Wed Jan 25 16:38:27 2012
@@ -1,4 +1,4 @@
-/* 	$NetBSD: rasops8.c,v 1.30 2012/01/04 20:16:20 macallan Exp $	*/
+/* 	$NetBSD: rasops8.c,v 1.31 2012/01/25 16:38:27 macallan Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.30 2012/01/04 20:16:20 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.31 2012/01/25 16:38:27 macallan Exp $");
 
 #include "opt_rasops.h"
 
@@ -205,6 +205,7 @@ rasops8_putchar_aa(void *cookie, int row
 	struct wsdisplay_font *font = PICK_FONT(ri, uc);
 	int x, y, r, g, b, aval;
 	int r1, g1, b1, r0, g0, b0, fgo, bgo;
+	uint8_t scanline[32] __attribute__ ((aligned(8)));
 
 	hp = hrp = NULL;
 
@@ -278,11 +279,11 @@ rasops8_putchar_aa(void *cookie, int row
 						((g & 0xe000) >> 11) |
 						((b & 0xc000) >> 14);
 				}
-				*dp = pixel;
-				dp++;
+				scanline[x] = pixel;
 			}
+			memcpy(rp, scanline, width);
 			if (ri->ri_hwbits) {
-				memcpy(rp, hrp, width);
+				memcpy(hrp, scanline, width);
 				hrp += ri->ri_stride;
 			}
 			rp += ri->ri_stride;