 @@ -1,14 +1,14 @@
-/*	$NetBSD: tifb.c,v 1.3 2014/08/22 20:01:16 jakllsch Exp $	*/
+/*	$NetBSD: tifb.c,v 1.4 2015/04/11 13:44:14 bouyer 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.
 @@ -47,27 +47,27 @@
  * 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 framebuffer driver for TI 35xx built-in video controller
  * tested on beaglebone
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tifb.c,v 1.3 2014/08/22 20:01:16 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tifb.c,v 1.4 2015/04/11 13:44:14 bouyer Exp $");
 #include "opt_omap.h"
 #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>
 @@ -216,26 +216,27 @@ struct wsdisplay_accessops tifb_accessop
 	NULL, 	/* load_font */
 	NULL,	/* pollc */
 	NULL	/* scroll */
 };
 extern const u_char rasops_cmap[768];
 static struct evcnt ev_sync_lost;
 static struct evcnt ev_palette;
 static struct evcnt ev_eof0;
 static struct evcnt ev_eof1;
 static struct evcnt ev_fifo_underflow;
 static struct evcnt ev_ac_bias;
 static struct evcnt ev_frame_done;
 static struct evcnt ev_others;
 static uint32_t
 am335x_lcd_calc_divisor(uint32_t reference, uint32_t freq)
+{
 	uint32_t div;
 	/* Raster mode case: divisors are in range from 2 to 255 */
 	for (div = 2; div < 255; div++)
 		if (reference/div <= freq)
 			return (div);
 	return (255);
 @@ -309,26 +310,28 @@ tifb_attach(device_t parent, device_t se
 	evcnt_attach_dynamic(&ev_sync_lost, EVCNT_TYPE_MISC, NULL,
 	    "lcd", "sync lost");
 	evcnt_attach_dynamic(&ev_palette, EVCNT_TYPE_MISC, NULL,
 	    "lcd", "palette loaded");
 	evcnt_attach_dynamic(&ev_eof0, EVCNT_TYPE_MISC, NULL,
 	    "lcd", "eof0");
 	evcnt_attach_dynamic(&ev_eof1, EVCNT_TYPE_MISC, NULL,
 	    "lcd", "eof1");
 	evcnt_attach_dynamic(&ev_fifo_underflow, EVCNT_TYPE_MISC, NULL,
 	    "lcd", "fifo underflow");
 	evcnt_attach_dynamic(&ev_ac_bias, EVCNT_TYPE_MISC, NULL,
 	    "lcd", "ac bias");
 	evcnt_attach_dynamic(&ev_frame_done, EVCNT_TYPE_MISC, NULL,
 	    "lcd", "frame_done");
 	evcnt_attach_dynamic(&ev_others, EVCNT_TYPE_MISC, NULL,
 	    "lcd", "others");
 	sc->sc_iot = obio->obio_iot;
 	sc->sc_dev = self;
 	sc->sc_dmat = obio->obio_dmat;
 	if (bus_space_map(obio->obio_iot, obio->obio_addr, obio->obio_size, 0,
 	    &sc->sc_regh)) {
 		aprint_error(": couldn't map register space\n");
 		return;
+	}
 @@ -390,27 +393,27 @@ tifb_attach(device_t parent, device_t se
+	}
 	sc->sc_vramsize = sc->sc_palettesize +
 	    sc->sc_stride * sc->sc_panel->panel_height;
 	if (bus_dmamem_alloc(sc->sc_dmat, sc->sc_vramsize, 0, 0,
 	    sc->sc_dmamem, 1, &segs, BUS_DMA_NOWAIT) != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "failed to allocate video memory\n");
 		return;
+	}
 	if (bus_dmamem_map(sc->sc_dmat, sc->sc_dmamem, 1, sc->sc_vramsize,
-	    &sc->sc_vramaddr, BUS_DMA_NOWAIT | BUS_DMA_COHERENT) != 0) {
+	    &sc->sc_vramaddr, BUS_DMA_NOWAIT) != 0) {
 		aprint_error_dev(sc->sc_dev, "failed to map video RAM\n");
 		return;
+	}
 	sc->sc_fbaddr = (uint8_t *)sc->sc_vramaddr + sc->sc_palettesize;
 	sc->sc_palette = sc->sc_vramaddr;
 	if (bus_dmamap_create(sc->sc_dmat, sc->sc_vramsize, 1, sc->sc_vramsize,
 , BUS_DMA_NOWAIT, &sc->sc_dmamap) != 0) {
 		aprint_error_dev(sc->sc_dev, "failed to create DMA map\n");
 		return;
+	}
 	if (bus_dmamap_load(sc->sc_dmat, sc->sc_dmamap, sc->sc_vramaddr,
 @@ -673,26 +676,37 @@ tifb_intr(void *v)
 	if (reg & IRQ_PL) {
 		ev_palette.ev_count ++;
 		reg = TIFB_READ(sc, LCD_RASTER_CTRL);
 		reg &= ~RASTER_CTRL_LCDEN;
 		TIFB_WRITE(sc, LCD_RASTER_CTRL, reg);
 		reg = TIFB_READ(sc, LCD_RASTER_CTRL);
 		reg |= RASTER_CTRL_LCDEN;
 		TIFB_WRITE(sc, LCD_RASTER_CTRL, reg);
 		return 0;
+	}
 	if (reg & (IRQ_FRAME_DONE|IRQ_EOF0|IRQ_EOF1)) {
 		/* flush the write-back cache */
 		bus_dmamap_sync(sc->sc_dmat, sc->sc_dmamap,
 , sc->sc_vramsize, BUS_DMASYNC_PREWRITE);
+	}
 	if (reg & IRQ_FRAME_DONE) {
 		ev_frame_done.ev_count ++;
 		reg &= ~IRQ_FRAME_DONE;
+	}
 	if (reg & IRQ_EOF0) {
 		ev_eof0.ev_count ++;
 		TIFB_WRITE(sc, LCD_LCDDMA_FB0_BASE, sc->sc_dmamem->ds_addr);
 		TIFB_WRITE(sc, LCD_LCDDMA_FB0_CEILING,
 		    sc->sc_dmamem->ds_addr + sc->sc_vramsize - 1);
 		reg &= ~IRQ_EOF0;
+	}
 	if (reg & IRQ_EOF1) {
 		ev_eof1.ev_count ++;
 		TIFB_WRITE(sc, LCD_LCDDMA_FB1_BASE, sc->sc_dmamem->ds_addr);
 		TIFB_WRITE(sc, LCD_LCDDMA_FB1_CEILING,
 		    sc->sc_dmamem->ds_addr + sc->sc_vramsize - 1);