 @@ -1,14 +1,14 @@
-/*	$NetBSD: omapfb.c,v 1.14 2013/01/21 14:17:39 macallan Exp $	*/
+/*	$NetBSD: omapfb.c,v 1.15 2013/01/21 16:08:30 macallan Exp $	*/
 /*
  * Copyright (c) 2010 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 OMAP 3530's built-in video controller
  * tested on beagleboard only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.14 2013/01/21 14:17:39 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.15 2013/01/21 16:08:30 macallan 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 <uvm/uvm_extern.h>
 #include <dev/videomode/videomode.h>
 @@ -97,26 +97,28 @@ CFATTACH_DECL_NEW(omapfb, sizeof(struct
     omapfb_match, omapfb_attach, NULL, NULL);
 static int	omapfb_ioctl(void *, void *, u_long, void *, int,
 			     struct lwp *);
 static paddr_t	omapfb_mmap(void *, void *, off_t, int);
 static void	omapfb_init_screen(void *, struct vcons_screen *, int, long *);
 static int	omapfb_putcmap(struct omapfb_softc *, struct wsdisplay_cmap *);
 static int 	omapfb_getcmap(struct omapfb_softc *, struct wsdisplay_cmap *);
 static void	omapfb_restore_palette(struct omapfb_softc *);
 static void 	omapfb_putpalreg(struct omapfb_softc *, int, uint8_t,
 			    uint8_t, uint8_t);
 static int	omapfb_set_depth(struct omapfb_softc *, int);
 #if NOMAPDMA > 0
 static void	omapfb_init(struct omapfb_softc *);
 static void	omapfb_wait_idle(struct omapfb_softc *);
 static void	omapfb_rectfill(struct omapfb_softc *, int, int, int, int,
 			    uint32_t);
 static void	omapfb_bitblt(struct omapfb_softc *, int, int, int, int, int,
 			    int, int);
 static void	omapfb_cursor(void *, int, int, int);
 static void	omapfb_putchar(void *, int, int, u_int, long);
 static void	omapfb_copycols(void *, int, int, int, int);
 static void	omapfb_erasecols(void *, int, int, int, long);
 static void	omapfb_copyrows(void *, int, int, int);
 @@ -443,52 +445,54 @@ omapfb_ioctl(void *v, void *vs, u_long c
 				struct wsdisplayio_bus_id *busid;
 				busid = data;
 				busid->bus_type = WSDISPLAYIO_BUS_SOC;
 				return 0;
+			}
 		case WSDISPLAYIO_GINFO:
 			if (ms == NULL)
 				return ENODEV;
 			wdf = (void *)data;
 			wdf->height = ms->scr_ri.ri_height;
 			wdf->width = ms->scr_ri.ri_width;
-			wdf->depth = ms->scr_ri.ri_depth;
+			wdf->depth = 32;
 			wdf->cmsize = 256;
 			return 0;
 		case WSDISPLAYIO_GETCMAP:
 			return omapfb_getcmap(sc,
 			    (struct wsdisplay_cmap *)data);
 		case WSDISPLAYIO_PUTCMAP:
 			return omapfb_putcmap(sc,
 			    (struct wsdisplay_cmap *)data);
 		case WSDISPLAYIO_LINEBYTES:
-			*(u_int *)data = sc->sc_stride;
+			*(u_int *)data = sc->sc_width * 4;
 			return 0;
 		case WSDISPLAYIO_SMODE:
+			{
 				int new_mode = *(int*)data;
 				/* notify the bus backend */
 				if (new_mode != sc->sc_mode) {
 					sc->sc_mode = new_mode;
-					if(new_mode == WSDISPLAYIO_MODE_EMUL) {
+					if (new_mode == WSDISPLAYIO_MODE_EMUL) {
 						omapfb_set_depth(sc, 16);
 						vcons_redraw_screen(ms);
 					} else {
 						omapfb_set_depth(sc, 32);
+					}
+				}
+			}
 			return 0;
+	}
 	return EPASSTHROUGH;
+}
 static paddr_t
 omapfb_mmap(void *v, void *vs, off_t offset, int prot)
+{
 	paddr_t pa = -1;
 	struct vcons_data *vd = v;
 	struct omapfb_softc *sc = vd->cookie;
 @@ -620,26 +624,69 @@ static void
 omapfb_putpalreg(struct omapfb_softc *sc, int idx, uint8_t r, uint8_t g,
     uint8_t b)
+{
 	uint32_t reg;
 	if ((idx < 0) || (idx > 255))
 		return;
 	/* whack the DAC */
 	reg = (r << 16) | (g << 8) | b;
 	sc->sc_clut[idx] = reg;
+}
 static int
 omapfb_set_depth(struct omapfb_softc *sc, int d)
+{
 	uint32_t reg;
 	reg = OMAP_DISPC_ATTR_ENABLE |
 	      OMAP_DISPC_ATTR_BURST_16x32 |
 	      OMAP_DISPC_ATTR_REPLICATION;
 	switch (d) {
 		case 16:
 			reg |= OMAP_DISPC_ATTR_RGB16;
 			break;
 		case 32:
 			reg |= OMAP_DISPC_ATTR_RGB24;
 			break;
 		default:
 			aprint_error_dev(sc->sc_dev, "unsupported depth (%d)\n", d);
 			return EINVAL;
+	}
 	bus_space_write_4(sc->sc_iot, sc->sc_regh,
 	    OMAPFB_DISPC_GFX_ATTRIBUTES, reg);
 	/*
 	 * now tell the video controller that we're done mucking around and
 	 * actually update its settings
 	 */
 	reg = bus_space_read_4(sc->sc_iot, sc->sc_regh, OMAPFB_DISPC_CONTROL);
 	bus_space_write_4(sc->sc_iot, sc->sc_regh, OMAPFB_DISPC_CONTROL,
 	    reg | OMAP_DISPC_CTRL_GO_LCD | OMAP_DISPC_CTRL_GO_DIGITAL);
 	sc->sc_depth = d;
 	sc->sc_stride = sc->sc_width * (sc->sc_depth >> 3);
 	/* clear the screen here */
 #if NOMAPDMA > 0
 	omapfb_rectfill(sc, 0, 0, sc->sc_width, sc->sc_height, 0);
 #else
 	memset(sc->sc_fbaddr, 0, sc->sc_stride * sc->sc_height);
 #endif
 	return 0;
+}
 #if NOMAPDMA > 0
 static void
 omapfb_init(struct omapfb_softc *sc)
+{
 	omapdma_write_ch_reg(0, OMAPDMAC_CLNK_CTRL, 0);
 	omapdma_write_ch_reg(0, OMAPDMAC_CICRI, 0);
 	omapdma_write_ch_reg(0, OMAPDMAC_CSDPI,
 	    CSDPI_SRC_BURST_64 | CSDPI_DST_BURST_64 |
 	    CSDPI_WRITE_POSTED | CSDPI_DATA_TYPE_16);
+}
 static void
 omapfb_wait_idle(struct omapfb_softc *sc)