 @@ -1,14 +1,14 @@
-/*	$NetBSD: igsfb.c,v 1.54 2017/01/25 15:51:07 jakllsch Exp $ */
+/*	$NetBSD: igsfb.c,v 1.55 2017/01/25 16:11:54 jakllsch Exp $ */
 /*
  * Copyright (c) 2002, 2003 Valeriy E. Ushakov
  * 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 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * 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.
  */
 /*
  * Integraphics Systems IGA 168x and CyberPro series.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.54 2017/01/25 15:51:07 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.55 2017/01/25 16:11:54 jakllsch Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/bus.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wsfont/wsfont.h>
 @@ -269,52 +269,72 @@ igsfb_init_video(struct igsfb_devconfig
 	/*
 	 * On CyberPro we can use magic bswap bit in linear address.
 	 */
 	fbaddr = dc->dc_memaddr;
 	if (need_bswap) {
 		dc->dc_hwflags |= IGSFB_HW_BSWAP;
 		if (dc->dc_id >= 0x2000) {
 			dc->dc_hwflags |= IGSFB_HW_BE_SELECT;
 			fbaddr |= IGS_MEM_BE_SELECT;
+		}
+	}
 	/*
 	 * Map graphic coprocessor for mode setting and accelerated rasops.
 	 */
 	if (dc->dc_id >= 0x2000) { /* XXX */
 		if (bus_space_map(dc->dc_iot,
 				  dc->dc_iobase + IGS_COP_BASE_B, IGS_COP_SIZE,
 				  dc->dc_ioflags,
 				  &dc->dc_coph) != 0)
+		{
 			printf("unable to map COP registers\n");
 			return 1;
+		}
+	}
 	igsfb_hw_setup(dc);
 	/*
 	 * Don't map in all N megs, just the amount we need for the wsscreen.
 	 */
 	dc->dc_fbsz = dc->dc_stride * dc->dc_height;
 	if (bus_space_map(dc->dc_memt, fbaddr, dc->dc_fbsz,
 			  dc->dc_memflags | BUS_SPACE_MAP_LINEAR,
 			  &dc->dc_fbh) != 0)
+	{
 		if (dc->dc_id >= 0x2000) { /* XXX */
 			bus_space_unmap(dc->dc_iot, dc->dc_coph, IGS_COP_SIZE);
+		}
 		bus_space_unmap(dc->dc_iot, dc->dc_ioh, IGS_REG_SIZE);
 		printf("unable to map framebuffer\n");
 		return 1;
+	}
 	igsfb_init_cmap(dc);
 	/*
 	 * 1KB for cursor sprite data at the very end of the video memory.
 	 */
 	croffset = dc->dc_vmemsz - IGS_CURSOR_DATA_SIZE;
 	craddr = fbaddr + croffset;
 	if (bus_space_map(dc->dc_memt, craddr, IGS_CURSOR_DATA_SIZE,
 			  dc->dc_memflags | BUS_SPACE_MAP_LINEAR,
 			  &dc->dc_crh) != 0)
+	{
 		if (dc->dc_id >= 0x2000) { /* XXX */
 			bus_space_unmap(dc->dc_iot, dc->dc_coph, IGS_COP_SIZE);
+		}
 		bus_space_unmap(dc->dc_iot, dc->dc_ioh, IGS_REG_SIZE);
 		bus_space_unmap(dc->dc_memt, dc->dc_fbh, dc->dc_fbsz);
 		printf("unable to map cursor sprite region\n");
 		return 1;
+	}
 	/*
 	 * Tell the device where cursor sprite data are located in the
 	 * linear space (it takes data offset in 1KB units).
 	 */
 	croffset >>= 10;	/* bytes -> kilobytes */
 	igs_ext_write(dc->dc_iot, dc->dc_ioh,
 		      IGS_EXT_SPRITE_DATA_LO, croffset & 0xff);
 @@ -326,38 +346,29 @@ igsfb_init_video(struct igsfb_devconfig
 	/* XXX: fill dc_cursor and use igsfb_update_cursor() instead? */
 	memset(&dc->dc_cursor, 0, sizeof(struct igs_hwcursor));
 	va = bus_space_vaddr(dc->dc_memt, dc->dc_crh);
 	memset(va, /* transparent */ 0xaa, IGS_CURSOR_DATA_SIZE);
 	curctl = igs_ext_read(dc->dc_iot, dc->dc_ioh, IGS_EXT_SPRITE_CTL);
 	curctl |= IGS_EXT_SPRITE_64x64;
 	curctl &= ~IGS_EXT_SPRITE_VISIBLE;
 	igs_ext_write(dc->dc_iot, dc->dc_ioh, IGS_EXT_SPRITE_CTL, curctl);
 	dc->dc_curenb = 0;
 	/*
-	 * Map and init graphic coprocessor for accelerated rasops.
+	 * Init graphic coprocessor for accelerated rasops.
 	 */
 	if (dc->dc_id >= 0x2000) { /* XXX */
 		if (bus_space_map(dc->dc_iot,
 				  dc->dc_iobase + IGS_COP_BASE_B, IGS_COP_SIZE,
 				  dc->dc_ioflags,
 				  &dc->dc_coph) != 0)
 			printf("unable to map COP registers\n");
 			return 1;
 		/* XXX: hardcoded 8bpp */
 		bus_space_write_2(dc->dc_iot, dc->dc_coph,
 				  IGS_COP_SRC_MAP_WIDTH_REG,
 				  dc->dc_width - 1);
 		bus_space_write_2(dc->dc_iot, dc->dc_coph,
 				  IGS_COP_DST_MAP_WIDTH_REG,
 				  dc->dc_width - 1);
 		bus_space_write_1(dc->dc_iot, dc->dc_coph,
 				  IGS_COP_MAP_FMT_REG,
 				  IGS_COP_MAP_8BPP);
+	}