 @@ -1,14 +1,14 @@
-/*	$NetBSD: pm2fb.c,v 1.23 2013/07/30 19:21:50 macallan Exp $	*/
+/*	$NetBSD: pm2fb.c,v 1.24 2013/09/15 09:34:07 martin Exp $	*/
 /*
  * Copyright (c) 2009, 2012 Michael Lorenz
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * A console driver for Permedia 2 graphics controllers
  * tested on sparc64 only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.23 2013/07/30 19:21:50 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.24 2013/09/15 09:34:07 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <sys/atomic.h>
 #include <dev/videomode/videomode.h>
 #include <dev/pci/pcivar.h>
 @@ -849,27 +849,27 @@ pm2fb_rectfill_a(void *cookie, int x, in
+{
 	struct pm2fb_softc *sc = cookie;
 	pm2fb_rectfill(sc, x, y, wi, he,
 	    sc->vd.active->scr_ri.ri_devcmap[(attr >> 24 & 0xf)]);
+}
 static void
 pm2fb_bitblt(void *cookie, int xs, int ys, int xd, int yd,
     int wi, int he, int rop)
+{
 	struct pm2fb_softc *sc = cookie;
 	uint32_t dir = 0;
-	int rxs, rxd, rwi, rxdelta;
+	int rxd, rwi, rxdelta;
 	if (yd <= ys) {
 		dir |= PM2RE_INC_Y;
+	}
 	if (xd <= xs) {
 		dir |= PM2RE_INC_X;
+	}
 	pm2fb_wait(sc, 8);
 	bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_DDA_MODE, 0);
 	bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_MODE, 0);
 	if (sc->sc_depth == 8) {
 		int adjust;
 		/*
 @@ -881,51 +881,49 @@ pm2fb_bitblt(void *cookie, int xs, int y
 		 */
 		if (rop == 3) {
 			bus_space_write_4(sc->sc_memt, sc->sc_regh,
 			    PM2_RE_CONFIG,
 			    PM2RECFG_READ_SRC | PM2RECFG_WRITE_EN |
 			    PM2RECFG_ROP_EN | PM2RECFG_PACKED | (rop << 6));
 		} else {
 			bus_space_write_4(sc->sc_memt, sc->sc_regh,
 			    PM2_RE_CONFIG,
 			    PM2RECFG_READ_SRC | PM2RECFG_READ_DST |
 			    PM2RECFG_WRITE_EN | PM2RECFG_PACKED |
 			    PM2RECFG_ROP_EN | (rop << 6));
+		}
 		rxs = xs >> 2;
 		rxd = xd >> 2;
 		rwi = (wi + 7) >> 2;
 		rxdelta = (xs & 0xffc) - (xd & 0xffc);
 		/* adjust for non-aligned x */
 		adjust = ((xd & 3) - (xs & 3));
 		bus_space_write_4(sc->sc_memt, sc->sc_regh,
 		    PM2_RE_PACKEDDATA_LIMIT,
 		    (xd << 16) | (xd + wi) | (adjust << 29));
 	} else {
 		/* we're in 16 or 32bit mode */
 		if (rop == 3) {
 			bus_space_write_4(sc->sc_memt, sc->sc_regh,
 			    PM2_RE_CONFIG,
 			    PM2RECFG_READ_SRC | PM2RECFG_WRITE_EN |
 			    PM2RECFG_ROP_EN | PM2RECFG_PACKED | (rop << 6));
 		} else {
 			bus_space_write_4(sc->sc_memt, sc->sc_regh,
 			    PM2_RE_CONFIG,
 			    PM2RECFG_READ_SRC | PM2RECFG_READ_DST |
 			    PM2RECFG_WRITE_EN | PM2RECFG_PACKED |
 			    PM2RECFG_ROP_EN | (rop << 6));
+		}
 		rxs = xs;
 		rxd = xd;
 		rwi = wi;
 		rxdelta = xs - xd;
+	}
 	bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RECT_START,
 	    (yd << 16) | rxd);
 	bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RECT_SIZE,
 	    (he << 16) | rwi);
 	bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_SOURCE_DELTA,
 	    (((ys - yd) & 0xfff) << 16) | (rxdelta & 0xfff));
 	bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RENDER,
 	    PM2RE_RECTANGLE | dir);
+}
 @@ -1440,42 +1438,43 @@ pm2fb_i2c_read_byte(void *cookie, uint8_
 	return (i2c_bitbang_read_byte(cookie, valp, flags, &pm2fb_i2cbb_ops));
+}
 static int
 pm2fb_i2c_write_byte(void *cookie, uint8_t val, int flags)
+{
 	return (i2c_bitbang_write_byte(cookie, val, flags, &pm2fb_i2cbb_ops));
+}
 #define RefClk 14318	/* all frequencies are in kHz */
 static int
 pm2fb_set_pll(struct pm2fb_softc *sc, int freq)
+{
-	int m, n, p, diff, out_freq, bm, bn, bp, bdiff = 1000000, bfreq;
+	int m, n, p, diff, out_freq, bm = 1, bn = 3, bp = 0,
 	    bdiff = 1000000 /* , bfreq */;
 	int fi;
 	uint8_t temp;
 	/*
 	 * this should work on PM2V, PM2 needs something slightly different
 	 */
 	for (m = 1; m < 128; m++) {
 		for (n = 2 * m + 1; n < 256; n++) {
 			fi = RefClk * n / m;
 			for (p = 0; p < 2; p++) {
 				out_freq = fi >> (p + 1);
 				diff = abs(out_freq - freq);
 				if (diff < bdiff) {
 					bdiff = diff;
-					bfreq = out_freq;
+					/* bfreq = out_freq; */
 					bm = m;
 					bn = n;
 					bp = p;
+				}
+			}
+		}
+	}
 #if 0
 	/*
 	 * XXX
 	 * output between switching modes and attaching a wsdisplay will
 	 * go through firmware calls on sparc64 and potentially mess up
 	 * our drawing engine state