[src/trunk]: src/sys/dev/wsfb Fix GENFB_GLYPHCACHE with shadow fb.

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/15bca78a5bd7
branches:  trunk
changeset: 368396:15bca78a5bd7
user:      rin <rin%NetBSD.org@localhost>
date:      Sat Jul 09 13:37:12 2022 +0000

description:
Fix GENFB_GLYPHCACHE with shadow fb.

diffstat:

 sys/dev/wsfb/genfb.c |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r f686f6c2630b -r 15bca78a5bd7 sys/dev/wsfb/genfb.c
--- a/sys/dev/wsfb/genfb.c      Sat Jul 09 11:44:57 2022 +0000
+++ b/sys/dev/wsfb/genfb.c      Sat Jul 09 13:37:12 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb.c,v 1.86 2022/03/28 11:21:40 mlelstv Exp $ */
+/*     $NetBSD: genfb.c,v 1.87 2022/07/09 13:37:12 rin Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.86 2022/03/28 11:21:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.87 2022/07/09 13:37:12 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1004,7 +1004,7 @@
        struct rasops_info *ri = cookie;
        struct vcons_screen *scr = ri->ri_hw;
        struct genfb_softc *sc = scr->scr_cookie;
-       uint8_t *src, *dst;
+       uint8_t *src, *dst, *hwdst;
        gc_bucket *b;
        int i, idx, bi, cell;
 
@@ -1084,6 +1084,16 @@
                src += ri->ri_xscale;
                dst += ri->ri_stride;
        }
+       if (ri->ri_hwbits) {
+               src = sc->sc_cache + cell * sc->sc_cache_ri.ri_yscale;
+               hwdst = ri->ri_hwbits
+                   + row * ri->ri_yscale + col * ri->ri_xscale;
+               for (i = 0; i < ri->ri_font->fontheight; i++) {
+                       memcpy(hwdst, src, ri->ri_xscale);
+                       src += ri->ri_xscale;
+                       hwdst += ri->ri_stride;
+               }
+       }
        b->gb_lastread = time_uptime;
        return;
 nope: