[src/netbsd-9]: src/sys/arch/luna68k/dev Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/fc4ff10d52dc
branches:  netbsd-9
changeset: 963060:fc4ff10d52dc
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 03 17:07:51 2019 +0000

description:
Pull up following revision(s) (requested by rin in ticket #271):

        sys/arch/luna68k/dev/lunafb.c: revision 1.41

Correct size of framebuffer; page offset appears only once,
not every color depths.

Pointed out by Araki Ken. Thanks!

diffstat:

 sys/arch/luna68k/dev/lunafb.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r cb687e829363 -r fc4ff10d52dc sys/arch/luna68k/dev/lunafb.c
--- a/sys/arch/luna68k/dev/lunafb.c     Mon Sep 30 16:06:03 2019 +0000
+++ b/sys/arch/luna68k/dev/lunafb.c     Thu Oct 03 17:07:51 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.40 2019/07/23 14:34:11 rin Exp $ */
+/* $NetBSD: lunafb.c,v 1.40.2.1 2019/10/03 17:07:51 martin Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.40 2019/07/23 14:34:11 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.40.2.1 2019/10/03 17:07:51 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -308,8 +308,8 @@
 #endif
        case WSDISPLAYIO_MODE_DUMBFB:
                if (offset >= 0 &&
-                   offset < (m68k_page_offset(OMFB_FB_RADDR) +
-                   dc->dc_rowbytes * dc->dc_ht) * dc->dc_depth)
+                   offset < m68k_page_offset(OMFB_FB_RADDR) +
+                   dc->dc_rowbytes * dc->dc_ht * dc->dc_depth)
                        cookie = m68k_btop(m68k_trunc_page(OMFB_FB_RADDR) +
                            offset);
                break;