CVS commit: src/sys/dev/ic

[Michael Lorenz]

Module Name:    src
Committed By:   macallan
Date:           Fri Aug 26 22:50:11 UTC 2016

Modified Files:
        src/sys/dev/ic: ct65550.c

Log Message:
fix a bunch of bugs & tpyos in chipsfb_mmap() so wsfb can actually work


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/ct65550.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/ic/ct65550.c
diff -u src/sys/dev/ic/ct65550.c:1.10 src/sys/dev/ic/ct65550.c:1.11
--- src/sys/dev/ic/ct65550.c:1.10	Sat Jan  4 16:37:05 2014
+++ src/sys/dev/ic/ct65550.c	Fri Aug 26 22:50:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ct65550.c,v 1.10 2014/01/04 16:37:05 macallan Exp $	*/
+/*	$NetBSD: ct65550.c,v 1.11 2016/08/26 22:50:11 macallan Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Lorenz
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct65550.c,v 1.10 2014/01/04 16:37:05 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct65550.c,v 1.11 2016/08/26 22:50:11 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -770,12 +770,14 @@ chipsfb_mmap(void *v, void *vs, off_t of
 	struct chipsfb_softc *sc = vd->cookie;
 	paddr_t pa;
 
-	if (sc->sc_mmap != NULL)
-		return sc->sc_mmap(v, vs, offset, prot);
+	if (sc->sc_mmap != NULL) {
+		pa = sc->sc_mmap(v, vs, offset, prot);
+		if (pa != -1) return pa;
+	}
 
 	/* 'regular' framebuffer mmap()ing */
 	if (offset < sc->memsize) {
-		pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
+		pa = bus_space_mmap(sc->sc_memt, sc->sc_fb, offset, prot,
 		    BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE);
 		return pa;
 	}
@@ -792,7 +794,7 @@ chipsfb_mmap(void *v, void *vs, off_t of
 
 	if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
 		pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
-		    BUS_SPACE_MAP_LINEAR);
+		    BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE);
 		return pa;
 	}