Module Name: src
Committed By: rin
Date: Thu Aug 15 00:50:11 UTC 2019
Modified Files:
src/sys/dev/pci: radeonfb.c
Log Message:
Support bitmap fonts with stride 4 (i.e., width 17 to 32).
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/pci/radeonfb.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/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.104 src/sys/dev/pci/radeonfb.c:1.105
--- src/sys/dev/pci/radeonfb.c:1.104 Wed Mar 27 22:00:33 2019
+++ src/sys/dev/pci/radeonfb.c Thu Aug 15 00:50:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.104 2019/03/27 22:00:33 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.105 2019/08/15 00:50:11 rin Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.104 2019/03/27 22:00:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.105 2019/08/15 00:50:11 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2931,6 +2931,7 @@ radeonfb_putchar(void *cookie, int row,
uint32_t reg;
uint8_t *data8;
uint16_t *data16;
+ uint32_t *data32;
void *data;
if (dp->rd_wsmode != WSDISPLAYIO_MODE_EMUL)
@@ -3009,6 +3010,16 @@ radeonfb_putchar(void *cookie, int row,
}
break;
}
+ case 4: {
+ data32 = data;
+ for (i = 0; i < h; i++) {
+ reg = *data32;
+ bus_space_write_stream_4(sc->sc_regt,
+ sc->sc_regh, RADEON_HOST_DATA0, reg);
+ data32++;
+ }
+ break;
+ }
}
if (attr & 1)
radeonfb_rectfill(dp, xd, yd + h - 2, w, 1, fg);
