 @@ -1,14 +1,14 @@
-/*	$NetBSD: r128fb.c,v 1.10 2009/10/01 19:02:27 jmmv Exp $	*/
+/*	$NetBSD: r128fb.c,v 1.11 2010/09/09 01:22:11 macallan Exp $	*/
 /*
  * Copyright (c) 2007 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 ATI Rage 128 graphics controllers
  * tested on macppc only so far
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.10 2009/10/01 19:02:27 jmmv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.11 2010/09/09 01:22:11 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>
 @@ -49,42 +49,50 @@ __KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pciio.h>
 #include <dev/pci/r128fbreg.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 <dev/i2c/i2cvar.h>
 #include "opt_r128fb.h"
 #ifdef R128FB_DEBUG
 #define DPRINTF printf
 #else
 #define DPRINTF while(0) printf
 #endif
 struct r128fb_softc {
 	device_t sc_dev;
 	pci_chipset_tag_t sc_pc;
 	pcitag_t sc_pcitag;
 	bus_space_tag_t sc_memt;
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_fbh;
 	bus_space_handle_t sc_regh;
 	bus_addr_t sc_fb, sc_reg;
 	bus_size_t sc_fbsize, sc_regsize;
 	int sc_width, sc_height, sc_depth, sc_stride;
-	int sc_locked;
+	int sc_locked, sc_have_backlight, sc_bl_level;
 	void *sc_fbaddr;
 	struct vcons_screen sc_console_screen;
 	struct wsscreen_descr sc_defaultscreen_descr;
 	const struct wsscreen_descr *sc_screens[1];
 	struct wsscreen_list sc_screenlist;
 	struct vcons_data vd;
 	int sc_mode;
 	u_char sc_cmap_red[256];
 	u_char sc_cmap_green[256];
 	u_char sc_cmap_blue[256];
 	/* engine stuff */
 	uint32_t sc_master_cntl;
 };
 @@ -114,26 +122,30 @@ static void	r128fb_rectfill(struct r128f
 			    uint32_t);
 static void	r128fb_bitblt(struct r128fb_softc *, int, int, int, int, int,
 			    int, int);
 static void	r128fb_cursor(void *, int, int, int);
 #if 0
 static void	r128fb_putchar(void *, int, int, u_int, long);
 #endif
 static void	r128fb_copycols(void *, int, int, int, int);
 static void	r128fb_erasecols(void *, int, int, int, long);
 static void	r128fb_copyrows(void *, int, int, int);
 static void	r128fb_eraserows(void *, int, int, long);
 static void	r128fb_brightness_up(device_t);
 static void	r128fb_brightness_down(device_t);
 static void	r128fb_set_backlight(struct r128fb_softc *, int);
 struct wsdisplay_accessops r128fb_accessops = {
 	r128fb_ioctl,
 	r128fb_mmap,
 	NULL,	/* alloc_screen */
 	NULL,	/* free_screen */
 	NULL,	/* show_screen */
 	NULL, 	/* load_font */
 	NULL,	/* pollc */
 	NULL	/* scroll */
 };
 static inline void
 r128fb_wait(struct r128fb_softc *sc, int slots)
 @@ -181,26 +193,27 @@ r128fb_match(device_t parent, cfdata_t m
 static void
 r128fb_attach(device_t parent, device_t self, void *aux)
+{
 	struct r128fb_softc	*sc = device_private(self);
 	struct pci_attach_args	*pa = aux;
 	struct rasops_info	*ri;
 	char devinfo[256];
 	struct wsemuldisplaydev_attach_args aa;
 	prop_dictionary_t	dict;
 	unsigned long		defattr;
 	bool			is_console;
 	int i, j;
 	uint32_t reg;
 	sc->sc_pc = pa->pa_pc;
 	sc->sc_pcitag = pa->pa_tag;
 	sc->sc_memt = pa->pa_memt;
 	sc->sc_iot = pa->pa_iot;
 	sc->sc_dev = self;
 	pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
 	aprint_normal(": %s\n", devinfo);
 	/* fill in parameters from properties */
 	dict = device_properties(self);
 	if (!prop_dictionary_get_uint32(dict, "width", &sc->sc_width)) {
 @@ -295,27 +308,41 @@ r128fb_attach(device_t parent, device_t
 		/*
 		 * since we're not the console we can postpone the rest
 		 * until someone actually allocates a screen for us
 		 */
 		(*ri->ri_ops.allocattr)(ri, 0, 0, 0, &defattr);
+	}
 	aa.console = is_console;
 	aa.scrdata = &sc->sc_screenlist;
 	aa.accessops = &r128fb_accessops;
 	aa.accesscookie = &sc->vd;
 	config_found(sc->sc_dev, &aa, wsemuldisplaydevprint);
 	/* no suspend/resume support yet */
 	pmf_device_register(sc->sc_dev, NULL, NULL);
 	reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, R128_LVDS_GEN_CNTL);
 	DPRINTF("reg: %08x\n", reg);
 	if (reg & R128_LVDS_ON) {
 		sc->sc_have_backlight = 1;
 		sc->sc_bl_level = 255 -
 		    ((reg & R128_LEVEL_MASK) >> R128_LEVEL_SHIFT);
 		pmf_event_register(sc->sc_dev, PMFE_DISPLAY_BRIGHTNESS_UP,
 		    r128fb_brightness_up, TRUE);
 		pmf_event_register(sc->sc_dev, PMFE_DISPLAY_BRIGHTNESS_DOWN,
 		    r128fb_brightness_down, TRUE);
 	} else
 		sc->sc_have_backlight = 0;
+}
 static int
 r128fb_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
 	struct lwp *l)
+{
 	struct vcons_data *vd = v;
 	struct r128fb_softc *sc = vd->cookie;
 	struct wsdisplay_fbinfo *wdf;
 	struct vcons_screen *ms = vd->active;
 	switch (cmd) {
 @@ -777,13 +804,47 @@ r128fb_eraserows(void *cookie, int row,
 	int32_t x, y, width, height, fg, bg, ul;
 	if ((sc->sc_locked == 0) && (sc->sc_mode == WSDISPLAYIO_MODE_EMUL)) {
 		x = ri->ri_xorigin;
 		y = ri->ri_yorigin + ri->ri_font->fontheight * row;
 		width = ri->ri_emuwidth;
 		height = ri->ri_font->fontheight * nrows;
 		rasops_unpack_attr(fillattr, &fg, &bg, &ul);
 		r128fb_rectfill(sc, x, y, width, height, ri->ri_devcmap[bg]);
+	}
+}
 static void
 r128fb_set_backlight(struct r128fb_softc *sc, int level)
+{
 	uint32_t reg;
 	if (level > 255) level = 255;
 	if (level < 0) level = 0;
 	if (level == sc->sc_bl_level)
 		return;
 	sc->sc_bl_level = level;
 	level = 255 - level;
 	reg = bus_space_read_4(sc->sc_memt, sc->sc_regh, R128_LVDS_GEN_CNTL);
 	reg &= ~R128_LEVEL_MASK;
 	reg |= level << R128_LEVEL_SHIFT;
 	bus_space_write_4(sc->sc_memt, sc->sc_regh, R128_LVDS_GEN_CNTL, reg);
 	DPRINTF("level: %d reg %08x\n", level, reg);
+}
 static void
 r128fb_brightness_up(device_t dev)
+{
 	struct r128fb_softc *sc = device_private(dev);
 	r128fb_set_backlight(sc, sc->sc_bl_level + 8);
+}
 static void
 r128fb_brightness_down(device_t dev)
+{
 	struct r128fb_softc *sc = device_private(dev);
 	r128fb_set_backlight(sc, sc->sc_bl_level - 8);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: r128fbreg.h,v 1.1 2007/11/07 19:09:09 macallan Exp $	*/
+/*	$NetBSD: r128fbreg.h,v 1.2 2010/09/09 01:22:10 macallan Exp $	*/
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
  *                      VA Linux Systems Inc., Fremont, California.
+ *
  * All Rights Reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
  * without limitation on the rights to use, copy, modify, merge,
  * publish, distribute, sublicense, and/or sell copies of the Software,
 @@ -45,29 +45,55 @@
  *   SDK-G04000 Rev. 0.01), ATI Technologies: June 1999.
+ *
  */
 /*
  * register definitions for ATI Rage 128 graphics controllers
  * mostly from XFree86's ati driver
  */
 #ifndef R128FB_REG_H
 #define R128FB_REG_H
-#define R128_PALETTE_DATA                 0x00b4
+/* RAMDAC */
-#define R128_PALETTE_INDEX                0x00b0
+#define R128_PALETTE_DATA		0x00b4
 #define R128_PALETTE_INDEX		0x00b0
 /* flat panel registers */
 #define R128_FP_PANEL_CNTL		0x0288
 	#define FPCNT_DIGON		  0x00000001	/* FP dig. voltage */
 	#define FPCNT_BACKLIGHT_ON	  0x00000002
 	#define FPCNT_BL_MODULATION_ON	  0x00000004
 	#define FPCNT_BL_CLK_SEL	  0x00000008	/* 1 - divide by 3 */
 	#define FPCNT_MONID_EN		  0x00000010	/* use MONID pins for
 							   backlight control */
 	#define FPCNT_FPENABLE_POL	  0x00000020	/* 1 - active low */
 	#define FPCNT_LEVEL_MASK	  0x0000ff00
 	#define FPCNT_LEVEL_SHIFT	  8
 #define R128_LVDS_GEN_CNTL                0x02d0
 #       define R128_LVDS_ON               (1   <<  0)
 #       define R128_LVDS_DISPLAY_DIS      (1   <<  1)
 #       define R128_LVDS_EN               (1   <<  7)
 #       define R128_LVDS_DIGON            (1   << 18)
 #       define R128_LVDS_BLON             (1   << 19)
 #       define R128_LVDS_SEL_CRTC2        (1   << 23)
 #       define R128_HSYNC_DELAY_SHIFT     28
 #       define R128_HSYNC_DELAY_MASK      (0xf << 28)
 #	define R128_LEVEL_MASK	          0x0000ff00
 #	define R128_LEVEL_SHIFT	          8
 /* drawing engine */
 #define R128_PC_NGUI_CTLSTAT              0x0184
 #       define R128_PC_FLUSH_GUI          (3 << 0)
 #       define R128_PC_RI_GUI             (1 << 2)
 #       define R128_PC_FLUSH_ALL          0x00ff
 #       define R128_PC_BUSY               (1 << 31)
 #define R128_CRTC_OFFSET                  0x0224
 #define R128_DST_OFFSET                   0x1404
 #define R128_DST_PITCH                    0x1408
 #define R128_DP_GUI_MASTER_CNTL           0x146c
 #       define R128_GMC_SRC_PITCH_OFFSET_CNTL (1    <<  0)