 @@ -1,14 +1,14 @@
-/*	$NetBSD: p9100.c,v 1.44 2009/05/27 00:35:34 macallan Exp $ */
+/*	$NetBSD: p9100.c,v 1.45 2009/05/27 15:13:22 macallan Exp $ */
 /*-
  * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas.
+ *
  * 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.
 @@ -28,27 +28,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * color display (p9100) driver.
+ *
  * Does not handle interrupts, even though they can occur.
+ *
  * XXX should defer colormap updates to vertical retrace interrupts
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.44 2009/05/27 00:35:34 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.45 2009/05/27 15:13:22 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 @@ -61,31 +61,32 @@ __KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.
 #include <dev/sbus/p9100reg.h>
 #include <dev/sbus/sbusvar.h>
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wsfont/wsfont.h>
 #include <dev/rasops/rasops.h>
 #include <dev/wscons/wsdisplay_vconsvar.h>
 #include "opt_wsemul.h"
 #include "rasops_glue.h"
 #include "opt_pnozz.h"
 #include "tctrl.h"
 #if NTCTRL > 0
 #include <machine/tctrl.h>
-#include <sparc/dev/tctrlvar.h>/*XXX*/
+#include <sparc/dev/tctrlvar.h>	/*XXX*/
 #endif
 #ifdef PNOZZ_DEBUG
 #define DPRINTF aprint_normal
 #else
 #define DPRINTF while (0) aprint_normal
 #endif
 struct pnozz_cursor {
 	short	pc_enable;		/* cursor is enabled */
 	struct	fbcurpos pc_pos;	/* position */
 	struct	fbcurpos pc_hot;	/* hot-spot */
 	struct	fbcurpos pc_size;	/* size of mask & image fields */
 @@ -96,83 +97,79 @@ struct pnozz_cursor {
 /* per-display variables */
 struct p9100_softc {
 	device_t	sc_dev;		/* base device */
 	struct sbusdev	sc_sd;		/* sbus device */
 	struct fbdevice	sc_fb;		/* frame buffer device */
 	bus_space_tag_t	sc_bustag;
 	bus_addr_t	sc_ctl_paddr;	/* phys address description */
 	bus_size_t	sc_ctl_psize;	/*   for device mmap() */
 	bus_space_handle_t sc_ctl_memh;	/*   bus space handle */
 #if 0
 	bus_addr_t	sc_cmd_paddr;	/* phys address description */
 	bus_size_t	sc_cmd_psize;	/*   for device mmap() */
 	bus_space_handle_t sc_cmd_memh;	/*   bus space handle */
 #endif
 	bus_addr_t	sc_fb_paddr;	/* phys address description */
 	bus_size_t	sc_fb_psize;	/*   for device mmap() */
 	bus_space_handle_t sc_fb_memh;	/*   bus space handle */
 	volatile uint32_t sc_junk;
-	uint32_t sc_mono_width;	/* for setup_mono */
+	uint32_t 	sc_mono_width;	/* for setup_mono */
 	uint32_t	sc_width;
 	uint32_t	sc_height;	/* panel width / height */
 	uint32_t	sc_stride;
 	uint32_t	sc_depth;
 	int		sc_depthshift;	/* blitter works on bytes not pixels */
 	union	bt_cmap sc_cmap;	/* Brooktree color map */
 	struct pnozz_cursor sc_cursor;
-	int sc_mode;
+	int 		sc_mode;
-	int sc_video, sc_powerstate;
+	int 		sc_video, sc_powerstate;
-	uint32_t sc_bg;
+	uint32_t 	sc_bg;
 	volatile uint32_t sc_last_offset;
 	struct vcons_data vd;
 	uint8_t		sc_dac_power;
 };
 static struct vcons_screen p9100_console_screen;
 extern const u_char rasops_cmap[768];
 struct wsscreen_descr p9100_defscreendesc = {
 	"default",
 , 0,
 	NULL,
 , 16,
 	WSSCREEN_WSCOLORS,
 };
 const struct wsscreen_descr *_p9100_scrlist[] = {
 	&p9100_defscreendesc,
 	/* XXX other formats, graphics screen? */
 };
 struct wsscreen_list p9100_screenlist = {
-	sizeof(_p9100_scrlist) / sizeof(struct wsscreen_descr *), _p9100_scrlist
+	sizeof(_p9100_scrlist) / sizeof(struct wsscreen_descr *),
 	_p9100_scrlist
 };
 /* autoconfiguration driver */
 static int	p9100_sbus_match(device_t, cfdata_t, void *);
 static void	p9100_sbus_attach(device_t, device_t, void *);
 static void	p9100unblank(device_t);
 static void	p9100_shutdown(void *);
 CFATTACH_DECL_NEW(pnozz, sizeof(struct p9100_softc),
     p9100_sbus_match, p9100_sbus_attach, NULL, NULL);
 extern struct cfdriver pnozz_cd;
 static dev_type_open(p9100open);
 static dev_type_ioctl(p9100ioctl);
 static dev_type_mmap(p9100mmap);
 const struct cdevsw pnozz_cdevsw = {
 	p9100open, nullclose, noread, nowrite, p9100ioctl,
 	nostop, notty, nopoll, p9100mmap, nokqfilter,
 @@ -210,51 +207,50 @@ static void	p9100_setup_mono(struct p910
 		    uint32_t, uint32_t);
 static void	p9100_feed_line(struct p9100_softc *, int, uint8_t *);
 static void	p9100_set_color_reg(struct p9100_softc *, int, int32_t);
 static void	p9100_copycols(void *, int, int, int, int);
 static void	p9100_erasecols(void *, int, int, int, long);
 static void	p9100_copyrows(void *, int, int, int);
 static void	p9100_eraserows(void *, int, int, long);
 /*static int	p9100_mapchar(void *, int, u_int *);*/
 static void	p9100_putchar(void *, int, int, u_int, long);
 static void	p9100_cursor(void *, int, int, int);
 static int	p9100_allocattr(void *, int, int, int, long *);
 /*static void	p9100_scroll(void *, void *, int);*/
 static int	p9100_putcmap(struct p9100_softc *, struct wsdisplay_cmap *);
 static int 	p9100_getcmap(struct p9100_softc *, struct wsdisplay_cmap *);
 static int	p9100_ioctl(void *, void *, u_long, void *, int, struct lwp *);
 static paddr_t	p9100_mmap(void *, void *, off_t, int);
 /*static int	p9100_load_font(void *, void *, struct wsdisplay_font *);*/
 static void	p9100_init_screen(void *, struct vcons_screen *, int,
-	    long *);
+		    long *);
 #endif
 static void	p9100_init_cursor(struct p9100_softc *);
 static void	p9100_set_fbcursor(struct p9100_softc *);
 static void	p9100_setcursorcmap(struct p9100_softc *);
 static void	p9100_loadcursor(struct p9100_softc *);
 #if 0
 static int	p9100_intr(void *);
 #endif
 /* power management stuff */
-static void p9100_power_hook(int, void *);
+static bool p9100_suspend(device_t PMF_FN_PROTO);
 static bool p9100_resume(device_t PMF_FN_PROTO);
 #if NTCTRL > 0
 static void p9100_set_extvga(void *, int);
 #endif
 #if NWSDISPLAY > 0
 struct wsdisplay_accessops p9100_accessops = {
 	p9100_ioctl,
 	p9100_mmap,
 	NULL,	/* vcons_alloc_screen */
 	NULL,	/* vcons_free_screen */
 	NULL,	/* vcons_show_screen */
 	NULL,	/* load_font */
 @@ -298,28 +294,27 @@ p9100_sbus_attach(device_t parent, devic
 #if NWSDISPLAY > 0
 	struct wsemuldisplaydev_attach_args aa;
 	struct rasops_info *ri;
 	unsigned long defattr;
 #endif
 	sc->sc_last_offset = 0xffffffff;
 	sc->sc_dev = self;
 	/*
 	 * When the ROM has mapped in a p9100 display, the address
 	 * maps only the video RAM, so in any case we have to map the
-	 * registers ourselves.  We only need the video RAM if we are
+	 * registers ourselves.
 	 * going to print characters via rconsole.
 	 */
 	if (sa->sa_npromvaddrs != 0)
 		fb->fb_pixels = (void *)sa->sa_promvaddrs[0];
 	/* Remember cookies for p9100_mmap() */
 	sc->sc_bustag = sa->sa_bustag;
 	sc->sc_ctl_paddr = sbus_bus_addr(sa->sa_bustag,
 		sa->sa_reg[0].oa_space, sa->sa_reg[0].oa_base);
 	sc->sc_ctl_psize = 0x8000;/*(bus_size_t)sa->sa_reg[0].oa_size;*/
 	sc->sc_fb_paddr = sbus_bus_addr(sa->sa_bustag,
 @@ -330,32 +325,40 @@ p9100_sbus_attach(device_t parent, devic
 	    sa->sa_reg[0].oa_space,
 	    sa->sa_reg[0].oa_base,
 	    /*
 	     * XXX for some reason the SBus resources don't cover
 	     * all registers, so we just map what we need
 	     */
 x8000,
 , &sc->sc_ctl_memh) != 0) {
 		printf("%s: cannot map control registers\n",
 		    self->dv_xname);
 		return;
+	}
 	/*
 	 * we need to map the framebuffer even though we never write to it,
 	 * thanks to some weirdness in the SPARCbook's SBus glue for the
 	 * P9100 - all register accesses need to be 'latched in' whenever we
 	 * go to another 0x80 aligned 'page' by reading the framebuffer at the
 	 * same offset
 	 */
 	if (fb->fb_pixels == NULL) {
 		if (sbus_bus_map(sc->sc_bustag,
 		    sa->sa_reg[2].oa_space,
 		    sa->sa_reg[2].oa_base,
 		    sc->sc_fb_psize,
-		    BUS_SPACE_MAP_LINEAR, &sc->sc_fb_memh) != 0) {
+		    BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_LARGE,
 		    &sc->sc_fb_memh) != 0) {
 			printf("%s: cannot map framebuffer\n",
 			    self->dv_xname);
 			return;
+		}
 		fb->fb_pixels = (char *)sc->sc_fb_memh;
 	} else {
 		sc->sc_fb_memh = (bus_space_handle_t) fb->fb_pixels;
+	}
 	sc->sc_width = prom_getpropint(node, "width", 800);
 	sc->sc_height = prom_getpropint(node, "height", 600);
 	sc->sc_depth = prom_getpropint(node, "depth", 8) >> 3;
 	sc->sc_stride = prom_getpropint(node, "linebytes",
 @@ -372,97 +375,29 @@ p9100_sbus_attach(device_t parent, devic
 	fb->fb_pixels = NULL;
 	sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
 	isconsole = fb_is_console(node);
 #if 0
 	if (!isconsole) {
 		aprint_normal("\n");
 		aprint_error_dev(self, "fatal error: PROM didn't configure device\n");
 		return;
+	}
 #endif
 	/*
 	 * When the ROM has mapped in a p9100 display, the address
 	 * maps only the video RAM, so in any case we have to map the
 	 * registers ourselves.  We only need the video RAM if we are
 	 * going to print characters via rconsole.
 	 */
 	if (sbus_bus_map(sc->sc_bustag,
 			 sa->sa_reg[0].oa_space,
 			 sa->sa_reg[0].oa_base,
 			 /*
 			  * XXX for some reason the SBus resources don't cover
 			  * all registers, so we just map what we need
 			  */
 			 /*sc->sc_ctl_psize*/ 0x8000,
 			 /*BUS_SPACE_MAP_LINEAR*/0, &sc->sc_ctl_memh) != 0) {
 		aprint_error_dev(self, "cannot map control registers\n");
 		return;
 	if (sa->sa_npromvaddrs != 0)
 		fb->fb_pixels = (void *)sa->sa_promvaddrs[0];
 	if (fb->fb_pixels == NULL) {
 		if (sbus_bus_map(sc->sc_bustag,
 				sa->sa_reg[2].oa_space,
 				sa->sa_reg[2].oa_base,
 				sc->sc_fb_psize,
 				BUS_SPACE_MAP_LINEAR, &sc->sc_fb_memh) != 0) {
 			aprint_error_dev(self, "cannot map framebuffer\n");
 			return;
 		fb->fb_pixels = (char *)sc->sc_fb_memh;
 	} else {
 		sc->sc_fb_memh = (bus_space_handle_t) fb->fb_pixels;
 #if 0
 	/*
 	 * we set our own depth and OBP won't hand us anything else than 8 bit
 	 * anyway
 	 */
 	i = p9100_ctl_read_4(sc, 0x0004);
 	switch ((i >> 26) & 7) {
 	    case 5:
 	    	fb->fb_type.fb_depth = 32;
 		sc->sc_depth = 4;
 		sc->sc_depthshift = 2;
 		break;
 	    case 7:
 	    	fb->fb_type.fb_depth = 24;
 		/* bitch and moan */
 		break;
 	    case 3:
 	    	fb->fb_type.fb_depth = 16;
 		sc->sc_depth = 2;
 		sc->sc_depthshift = 1;
 		break;
 	    case 2:
 	    	fb->fb_type.fb_depth = 8;
 		sc->sc_depth = 1;
 		sc->sc_depthshift = 0;
 		break;
 	    default: {
 		panic("pnozz: can't determine screen depth (0x%02x)", i);
 #else
     	fb->fb_type.fb_depth = 8;
 	sc->sc_depth = 1;
 	sc->sc_depthshift = 0;
 #endif
 	/* check the RAMDAC */
 	ver = p9100_ramdac_read_ctl(sc, DAC_VERSION);
 	p9100_init_engine(sc);
 	p9100_set_depth(sc, 8);
 	fb_setsize_obp(fb, fb->fb_type.fb_depth, sc->sc_width, sc->sc_height,
 	    node);
 	sbus_establish(&sc->sc_sd, sc->sc_dev);
 #if 0
 	bus_intr_establish(sc->sc_bustag, sa->sa_pri, IPL_BIO,
 @@ -479,28 +414,31 @@ p9100_sbus_attach(device_t parent, devic
 		sc->sc_cmap.cm_map[i][0] = rasops_cmap[j];
 		j++;
 		sc->sc_cmap.cm_map[i][1] = rasops_cmap[j];
 		j++;
 		sc->sc_cmap.cm_map[i][2] = rasops_cmap[j];
 		j++;
+	}
 	p9100loadcmap(sc, 0, 256);
 	/* make sure we are not blanked */
 	if (isconsole)
 		p9100_set_video(sc, 1);
-	if (shutdownhook_establish(p9100_shutdown, sc) == NULL) {
+	/* register with power management */
-		panic("%s: could not establish shutdown hook",
+	sc->sc_video = 1;
 	sc->sc_powerstate = PWR_RESUME;
 	if (!pmf_device_register(self, p9100_suspend, p9100_resume)) {
 		panic("%s: could not register with PMF",
 		      device_xname(sc->sc_dev));
+	}
 	if (isconsole) {
 		printf(" (console)\n");
 #ifdef RASTERCONSOLE
 		/*p9100loadcmap(sc, 255, 1);*/
 		fbrcons_init(fb);
 #endif
 	} else
 		printf("\n");
 #if NWSDISPLAY > 0
 @@ -524,67 +462,42 @@ p9100_sbus_attach(device_t parent, devic
 	if(isconsole) {
 		wsdisplay_cnattach(&p9100_defscreendesc, ri, 0, 0, defattr);
+	}
 	aa.console = isconsole;
 	aa.scrdata = &p9100_screenlist;
 	aa.accessops = &p9100_accessops;
 	aa.accesscookie = &sc->vd;
 	config_found(self, &aa, wsemuldisplaydevprint);
 #endif
 	fb->fb_type.fb_size = fb->fb_type.fb_height * fb->fb_linebytes;
-	printf(": rev %d / %x, %dx%d, depth %d mem %x",
+	printf("%s: rev %d / %x, %dx%d, depth %d mem %x\n",
-	       (i & 7), ver, fb->fb_type.fb_width, fb->fb_type.fb_height,
+		device_xname(self),
-	       fb->fb_type.fb_depth, (unsigned int)sc->sc_fb_psize);
+		(i & 7), ver, fb->fb_type.fb_width, fb->fb_type.fb_height,
 		fb->fb_type.fb_depth, (unsigned int)sc->sc_fb_psize);
 	/* cursor sprite handling */
 	p9100_init_cursor(sc);
 	/* attach the fb */
 	fb_attach(fb, isconsole);
 	/* register with power management */
 	sc->sc_video = 1;
 	sc->sc_powerstate = PWR_RESUME;
 	powerhook_establish(device_xname(sc->sc_dev), p9100_power_hook, sc);
 #if NTCTRL > 0
 	/* register callback for external monitor status change */
 	tadpole_register_callback(p9100_set_extvga, sc);
 #endif
+}
 static void
 p9100_shutdown(void *arg)
 	struct p9100_softc *sc = arg;
 #ifdef RASTERCONSOLE
 	sc->sc_cmap.cm_map[0][0] = 0xff;
 	sc->sc_cmap.cm_map[0][1] = 0xff;
 	sc->sc_cmap.cm_map[0][2] = 0xff;
 	sc->sc_cmap.cm_map[1][0] = 0;
 	sc->sc_cmap.cm_map[1][1] = 0;
 	sc->sc_cmap.cm_map[1][2] = 0x00;
 	p9100loadcmap(sc, 0, 2);
 	sc->sc_cmap.cm_map[255][0] = 0;
 	sc->sc_cmap.cm_map[255][1] = 0;
 	sc->sc_cmap.cm_map[255][2] = 0;
 	p9100loadcmap(sc, 255, 1);
 #endif
 	p9100_set_video(sc, 1);
 int
 p9100open(dev_t dev, int flags, int mode, struct lwp *l)
+{
 	int unit = minor(dev);
 	if (device_lookup(&pnozz_cd, unit) == NULL)
 		return (ENXIO);
 	return (0);
+}
 int
 p9100ioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
+{
 @@ -964,27 +877,27 @@ p9100_ramdac_write_ctl(struct p9100_soft
 	p9100_ramdac_write(sc, DAC_INDX_HI, (off & 0xff00) >> 8);
 	p9100_ramdac_write(sc, DAC_INDX_DATA, val);
+}
 #endif /* NTCTRL > 0 */
 /*
  * Undo the effect of an FBIOSVIDEO that turns the video off.
  */
 static void
 p9100unblank(device_t dev)
+{
 	struct p9100_softc *sc = device_private(dev);
-	p9100_set_video((struct p9100_softc *)dev, 1);
+	p9100_set_video(sc, 1);
 	/*
 	 * Check if we're in terminal mode. If not force the console screen
 	 * to front so we can see ddb, panic messages and so on
 	 */
 	if (sc->sc_mode != WSDISPLAYIO_MODE_EMUL) {
 		sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
 		if (sc->vd.active != &p9100_console_screen) {
 			SCREEN_INVISIBLE(sc->vd.active);
 			sc->vd.active = &p9100_console_screen;
 			SCREEN_VISIBLE(&p9100_console_screen);
+		}
 		p9100_init_engine(sc);
 @@ -1006,47 +919,60 @@ p9100_set_video(struct p9100_softc *sc,
 #if NTCTRL > 0
 	/* Turn On/Off the TFT if we know how.
 	 */
 	tadpole_set_video(enable);
 #endif
+}
 static int
 p9100_get_video(struct p9100_softc *sc)
+{
 	return (p9100_ctl_read_4(sc, SCRN_RPNT_CTL_1) & VIDEO_ENABLED) != 0;
+}
-static void
+static bool
-p9100_power_hook(int why, void *cookie)
+p9100_suspend(device_t dev PMF_FN_ARGS)
+{
-	struct p9100_softc *sc = cookie;
+	struct p9100_softc *sc = device_private(dev);
-	if (why == sc->sc_powerstate)
+	if (sc->sc_powerstate == PWR_SUSPEND)
-		return;
+		return TRUE;
-	switch(why)
+	sc->sc_video = p9100_get_video(sc);
 	sc->sc_dac_power = p9100_ramdac_read_ctl(sc, DAC_POWER_MGT);
-		case PWR_SUSPEND:
+	p9100_ramdac_write_ctl(sc, DAC_POWER_MGT,
-		case PWR_STANDBY:
+		DAC_POWER_SCLK_DISABLE |
-			sc->sc_video = p9100_get_video(sc);
+		DAC_POWER_DDOT_DISABLE |
-			p9100_set_video(sc, 0);
+		DAC_POWER_SYNC_DISABLE |
-			sc->sc_powerstate = why;
+		DAC_POWER_ICLK_DISABLE |
-			break;
+		DAC_POWER_IPWR_DISABLE);
-		case PWR_RESUME:
+	p9100_set_video(sc, 0);
-			p9100_set_video(sc, sc->sc_video);
+	sc->sc_powerstate = PWR_SUSPEND;
-			sc->sc_powerstate = why;
+	return TRUE;
 			break;
 static bool
 p9100_resume(device_t dev PMF_FN_ARGS)
+{
 	struct p9100_softc *sc = device_private(dev);
 	if (sc->sc_powerstate == PWR_RESUME)
 		return TRUE;
 	p9100_ramdac_write_ctl(sc, DAC_POWER_MGT, sc->sc_dac_power);
 	p9100_set_video(sc, sc->sc_video);
 	sc->sc_powerstate = PWR_RESUME;
 	return TRUE;
+}
 /*
  * Load a subset of the current (new) colormap into the IBM RAMDAC.
  */
 static void
 p9100loadcmap(struct p9100_softc *sc, int start, int ncolors)
+{
 	int i;
 	sc->sc_last_offset = 0xffffffff;
 	p9100_ramdac_write(sc, DAC_CMAP_WRIDX, start);
 @@ -1097,35 +1023,27 @@ p9100mmap(dev_t dev, off_t off, int prot
 			off,
 			prot,
 			BUS_SPACE_MAP_LINEAR));
+	}
 	off -= sc->sc_fb_psize;
 	if (off < sc->sc_ctl_psize) {
 		return (bus_space_mmap(sc->sc_bustag,
 			sc->sc_ctl_paddr,
 			off,
 			prot,
 			BUS_SPACE_MAP_LINEAR));
+	}
 #if 0
 	off -= sc->sc_ctl_psize;
 	return (bus_space_mmap(sc->sc_bustag,
 		sc->sc_cmd_paddr,
 		off,
 		prot,
 		BUS_SPACE_MAP_LINEAR));
 #endif
 	return EINVAL;
+}
 /* wscons stuff */
 #if NWSDISPLAY > 0
 static void
 p9100_cursor(void *cookie, int on, int row, int col)
+{
 	struct rasops_info *ri = cookie;
 	struct vcons_screen *scr = ri->ri_hw;
 	struct p9100_softc *sc = scr->scr_cookie;
 	int x, y, wi,he;