 @@ -1,14 +1,14 @@
-/*	$NetBSD: voodoofb.c,v 1.32 2012/01/17 21:31:46 macallan Exp $	*/
+/*	$NetBSD: voodoofb.c,v 1.33 2012/01/18 08:04:18 macallan Exp $	*/
 /*
  * Copyright (c) 2005, 2006 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.
 @@ -22,27 +22,27 @@
  * 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 3Dfx Voodoo3 graphics boards
  * Thanks to Andreas Drewke (andreas_dr@gmx.de) for his Voodoo3 driver for BeOS
  * which I used as reference / documentation
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.32 2012/01/17 21:31:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.33 2012/01/18 08:04:18 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/kauth.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 @@ -966,28 +966,29 @@ voodoofb_ioctl(void *v, void *vs, u_long
 			if (new_mode == WSDISPLAYIO_MODE_EMUL) {
 				voodoofb_drm_map(sc);
 				int i;
 				/* restore the palette */
 				for (i = 0; i < 256; i++) {
 					voodoofb_putpalreg(sc,
 					   i,
 					   sc->sc_cmap_red[i],
 					   sc->sc_cmap_green[i],
 					   sc->sc_cmap_blue[i]);
+				}
 				vcons_redraw_screen(ms);
-			} else
+			} else {
 				voodoofb_drm_unmap(sc);
+			}
+		}
+		}
 		return 0;
+	}
 	return EPASSTHROUGH;
+}
 static paddr_t
 voodoofb_mmap(void *v, void *vs, off_t offset, int prot)
+{
 	struct vcons_data *vd = v;
 	struct voodoofb_softc *sc = vd->cookie;
 	paddr_t pa;
 @@ -1175,31 +1176,41 @@ voodoofb_setup_monitor(struct voodoofb_s
 	horizontal_sync_start	= (vm->hsync_start >> 3) - 1;
 	horizontal_sync_end	= (vm->hsync_end >> 3) - 1;
 	horizontal_total  	= (vm->htotal   >> 3) - 1;
 	horizontal_blanking_start = horizontal_display_end;
 	horizontal_blanking_end = horizontal_total;
 	vertical_display_enable_end  = vm->vdisplay - 1;
 	vertical_sync_start  	= vm->vsync_start;	// - 1;
 	vertical_sync_end	= vm->vsync_end;	// - 1;
 	vertical_total		= vm->vtotal - 2;
 	vertical_blanking_start	= vertical_display_enable_end;
 	vertical_blanking_end	= vertical_total;
 #if 0
 	misc = 0x0f |
 	    (vm->hdisplay < 400 ? 0xa0 :
 		vm->hdisplay < 480 ? 0x60 :
 		vm->hdisplay < 768 ? 0xe0 : 0x20);
 #else
 	misc = 0x2f;
 	if (vm->flags & VID_NHSYNC)
 		misc |= HSYNC_NEG;
 	if (vm->flags & VID_NVSYNC)
 		misc |= VSYNC_NEG;
 #ifdef VOODOOFB_DEBUG
 	printf("misc: %02x\n", misc);
 #endif
 #endif
 	mode->vr_seq[0] = 3;
 	mode->vr_seq[1] = 1;
 	mode->vr_seq[2] = 8;
 	mode->vr_seq[3] = 0;
 	mode->vr_seq[4] = 6;
 	/* crtc regs start */
 	mode->vr_crtc[0] = horizontal_total - 4;
 	mode->vr_crtc[1] = horizontal_display_end;
 	mode->vr_crtc[2] = horizontal_blanking_start;
 	mode->vr_crtc[3] = 0x80 | (horizontal_blanking_end & 0x1f);
 	mode->vr_crtc[4] = horizontal_sync_start;
 @@ -1237,27 +1248,27 @@ voodoofb_setup_monitor(struct voodoofb_s
 	mode->vr_crtc[24] = 255;
 	/* overflow registers */
 	mode->vr_crtc[CRTC_HDISP_EXT] =
 	    (horizontal_total&0x100) >> 8 |
 	    (horizontal_display_end & 0x100) >> 6 |
 	    (horizontal_blanking_start & 0x100) >> 4 |
 	    (horizontal_blanking_end & 0x40) >> 1 |
 	    (horizontal_sync_start & 0x100) >> 2 |
 	    (horizontal_sync_end & 0x20) << 2;
 	mode->vr_crtc[CRTC_VDISP_EXT] =
 	    (vertical_total & 0x400) >> 10 |
-	    (vertical_display_enable_end & 0x400) >> 8 |
+	    (vertical_display_enable_end & 0x400) >> 8 | /* the manual is contradictory here */
 	    (vertical_blanking_start & 0x400) >> 6 |
 	    (vertical_blanking_end & 0x400) >> 4;
 	/* attr regs start */
 	mode->vr_attr[0] = 0;
 	mode->vr_attr[1] = 0;
 	mode->vr_attr[2] = 0;
 	mode->vr_attr[3] = 0;
 	mode->vr_attr[4] = 0;
 	mode->vr_attr[5] = 0;
 	mode->vr_attr[6] = 0;
 	mode->vr_attr[7] = 0;
 	mode->vr_attr[8] = 0;
 @@ -1428,26 +1439,36 @@ voodoofb_init(struct voodoofb_softc *sc)
 	voodoo3_make_room(sc, 8);
 	voodoo3_write32(sc, SRCBASE, 0);
 	voodoo3_write32(sc, DSTBASE, 0);
 	voodoo3_write32(sc, COMMANDEXTRA_2D, 0);
   	voodoo3_write32(sc, CLIP0MIN,        0);
   	voodoo3_write32(sc, CLIP0MAX,        0x1fff1fff);
   	voodoo3_write32(sc, CLIP1MIN,        0);
   	voodoo3_write32(sc, CLIP1MAX,        0x1fff1fff);
 	voodoo3_write32(sc, SRCXY, 0);
 	voodoofb_wait_idle(sc);
+}
 #define MAX_CLOCK 250000	/* all Voodoo3 should support that */
 #define MAX_HRES  1700		/*
 				 * XXX in theory we can go higher but I
 				 * couldn't get anything above 1680 x 1200
 				 * to work, so until I find out why it's
 				 * disabled so people won't end up with a
 				 * blank screen
 				 */
 #define MODE_IS_VALID(m) (((m)->dot_clock <= MAX_CLOCK) && \
 					    ((m)->hdisplay < MAX_HRES))
 static void
 voodoofb_setup_i2c(struct voodoofb_softc *sc)
+{
 	int i;
 	/* Fill in the i2c tag */
 	sc->sc_i2c.ic_cookie = sc;
 	sc->sc_i2c.ic_acquire_bus = voodoofb_i2c_acquire_bus;
 	sc->sc_i2c.ic_release_bus = voodoofb_i2c_release_bus;
 	sc->sc_i2c.ic_send_start = voodoofb_i2c_send_start;
 	sc->sc_i2c.ic_send_stop = voodoofb_i2c_send_stop;
 	sc->sc_i2c.ic_initiate_xfer = voodoofb_i2c_initiate_xfer;
 	sc->sc_i2c.ic_read_byte = voodoofb_i2c_read_byte;
 @@ -1472,40 +1493,53 @@ voodoofb_setup_i2c(struct voodoofb_softc
 	if (i < 3) {
 		if (edid_parse(sc->sc_edid_data, &sc->sc_edid_info) != -1) {
 #ifdef VOODOOFB_DEBUG
 			edid_print(&sc->sc_edid_info);
 #endif
 			/*
 			 * Now pick a mode.
 			 * How do we know our max. pixel clock?
 			 * All Voodoo3 should support at least 250MHz.
 			 * All Voodoo3 I've seen so far have at least 8MB
 			 * which we're not going to exhaust either in 8bit.
 			 */
 			if ((sc->sc_edid_info.edid_preferred_mode != NULL)) {
-				sc->sc_videomode =
+				struct videomode *m =
 				    sc->sc_edid_info.edid_preferred_mode;
-			} else {
+				if (MODE_IS_VALID(m)) {
 					sc->sc_videomode = m;
 				} else {
 					aprint_error_dev(sc->sc_dev,
 					    "unable to use preferred mode\n");
+				}
+			}
 			/*
 			 * if we can't use the preferred mode go look for the
 			 * best one we can support
 			 */
 			if (sc->sc_videomode == NULL) {
 				int n;
-				struct videomode *m = sc->sc_edid_info.edid_modes;
+				struct videomode *m =
 				     sc->sc_edid_info.edid_modes;
 				sort_modes(sc->sc_edid_info.edid_modes,
 			   	    &sc->sc_edid_info.edid_preferred_mode,
 				    sc->sc_edid_info.edid_nmodes);
 				while ((sc->sc_videomode == NULL) &&
 				       (n < sc->sc_edid_info.edid_nmodes)) {
-					if (m[n].dot_clock <= 250000) {
+					if (MODE_IS_VALID(&m[n])) {
 						sc->sc_videomode = &m[n];
+					}
 					n++;
+				}
+			}
+		}
+	}
+}
 /* I2C bitbanging */
 static void voodoofb_i2cbb_set_bits(void *cookie, uint32_t bits)
+{
 	struct voodoofb_softc *sc = cookie;
 	uint32_t out;
 	out = bits >> 2;	/* bitmasks match the IN bits */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: voodoofbreg.h,v 1.1 2006/04/11 16:11:07 macallan Exp $	*/
+/*	$NetBSD: voodoofbreg.h,v 1.2 2012/01/18 08:04:18 macallan Exp $	*/
 /*
  * Copyright 2005, 2006 by Michael Lorenz.
+ *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation for any purpose is hereby granted without fee,
  * provided that the above copyright notice appear in all copies and that
  * both that copyright notice and this permission notice appear in
  * supporting documentation, and that the name of Kevin E. Martin not be
  * used in advertising or publicity pertaining to distribution of the
  * software without specific, written prior permission.  Kevin E. Martin
  * makes no representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
 @@ -246,26 +246,28 @@
 #define DACMODE_2X		BIT(0)
 #define VIDPROCCFGMASK          0xa2e3eb6c
 #define VIDPROCDEFAULT		134481025
 #define VIDCHROMAMIN 		0x8c
 #define VIDCHROMAMAX 		0x90
 #define VIDDESKTOPOVERLAYSTRIDE 0xe8
 #define CRTC_INDEX	0x3d4
 #define CRTC_DATA	0x3d5
 #define SEQ_INDEX	0x3c4
 #define SEQ_DATA	0x3c5
 #define MISC_W		0x3c2
 	#define		VSYNC_NEG	0x80
 	#define		HSYNC_NEG	0x40
 #define GRA_INDEX	0x3ce
 #define GRA_DATA	0x3cf
 #define ATT_IW		0x3c0
 #define IS1_R		0x3da
 /* CRTC registers */
 #define CRTC_HTOTAL		0	/* lower 8 bit of display width in chars -5 */
 #define CRTC_HDISP_ENABLE_END	1	/* no. of visible chars per line -1 */
 #define CRTC_HDISP_BLANK_START	2	/* characters per line before blanking */
 #define CRTC_HDISP_BLANK_END	3	/* no. o blank chars, skew, compatibility read */
 #define CRTC_HDISP_SYNC_START	4	/* character count when sync becomes active */
 #define CRTC_HDISP_SYNC_END	5	/* sync end, skew, blank end */
 #define CRTC_VDISP_TOTAL	6	/* number of scanlines -2 */