Module Name: src
Committed By: macallan
Date: Wed Oct 28 02:10:27 UTC 2009
Modified Files:
src/sys/dev/pci: files.pci
Added Files:
src/sys/dev/pci: pm2fb.c pm2reg.h
Log Message:
A driver for the Permedia 2 graphics processor, so far it's been tested only
on sparc64 with a Sun PGX32 / TechSource Raptor GFX 8P
So far it accelerates block copies, rectangle fills and the cursor, it
supports the usual wsdisplay / vcons stuff.
TODO:
- character drawing by hardware so we don't need to map the framebuffer
- DDC2 support
- mode setting
This driver still relies on the firmware to set up graphics modes etc. so it
won't work on x86 ( or non-OpenFirmware for that matter ) unless you use the
VESA BIOS to set up graphics and pass the right properties ( width, height
etc. ) to the driver. For the same reason it will work only if it's the
OpenFirmware console.
To generate a diff of this commit:
cvs rdiff -u -r1.322 -r1.323 src/sys/dev/pci/files.pci
cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/pm2fb.c src/sys/dev/pci/pm2reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.322 src/sys/dev/pci/files.pci:1.323
--- src/sys/dev/pci/files.pci:1.322 Sat Sep 26 19:43:04 2009
+++ src/sys/dev/pci/files.pci Wed Oct 28 02:10:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.322 2009/09/26 19:43:04 snj Exp $
+# $NetBSD: files.pci,v 1.323 2009/10/28 02:10:27 macallan Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -988,3 +988,9 @@
# High Definition Audio
include "dev/pci/hdaudio/files.hdaudio"
+
+# Permedia 2 / Sun PGX32 / Raptor
+device pm2fb: wsemuldisplaydev, rasops8, vcons, videomode, iic, i2c_bitbang
+attach pm2fb at pci
+file dev/pci/pm2fb.c pm2fb
+defflag opt_pm2fb.h PM2FB_DEBUG
Added files:
Index: src/sys/dev/pci/pm2fb.c
diff -u /dev/null src/sys/dev/pci/pm2fb.c:1.1
--- /dev/null Wed Oct 28 02:10:27 2009
+++ src/sys/dev/pci/pm2fb.c Wed Oct 28 02:10:27 2009
@@ -0,0 +1,759 @@
+/* $NetBSD: pm2fb.c,v 1.1 2009/10/28 02:10:27 macallan Exp $ */
+
+/*
+ * Copyright (c) 2009 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * 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.
+ */
+
+/*
+ * A console driver for Permedia 2 graphics controllers
+ * tested on sparc64 only so far
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.1 2009/10/28 02:10:27 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>
+
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcidevs.h>
+#include <dev/pci/pciio.h>
+#include <dev/pci/pm2reg.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>
+
+struct pm2fb_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;
+ 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;
+};
+
+static int pm2fb_match(device_t, cfdata_t, void *);
+static void pm2fb_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(pm2fb, sizeof(struct pm2fb_softc),
+ pm2fb_match, pm2fb_attach, NULL, NULL);
+
+extern const u_char rasops_cmap[768];
+
+static int pm2fb_ioctl(void *, void *, u_long, void *, int,
+ struct lwp *);
+static paddr_t pm2fb_mmap(void *, void *, off_t, int);
+static void pm2fb_init_screen(void *, struct vcons_screen *, int, long *);
+
+static int pm2fb_putcmap(struct pm2fb_softc *, struct wsdisplay_cmap *);
+static int pm2fb_getcmap(struct pm2fb_softc *, struct wsdisplay_cmap *);
+static void pm2fb_restore_palette(struct pm2fb_softc *);
+static int pm2fb_putpalreg(struct pm2fb_softc *, uint8_t, uint8_t,
+ uint8_t, uint8_t);
+
+static void pm2fb_init(struct pm2fb_softc *);
+static void pm2fb_flush_engine(struct pm2fb_softc *);
+static void pm2fb_rectfill(struct pm2fb_softc *, int, int, int, int,
+ uint32_t);
+static void pm2fb_bitblt(struct pm2fb_softc *, int, int, int, int, int,
+ int, int);
+
+static void pm2fb_cursor(void *, int, int, int);
+#if 0
+static void pm2fb_putchar(void *, int, int, u_int, long);
+#endif
+static void pm2fb_copycols(void *, int, int, int, int);
+static void pm2fb_erasecols(void *, int, int, int, long);
+static void pm2fb_copyrows(void *, int, int, int);
+static void pm2fb_eraserows(void *, int, int, long);
+
+struct wsdisplay_accessops pm2fb_accessops = {
+ pm2fb_ioctl,
+ pm2fb_mmap,
+ NULL, /* alloc_screen */
+ NULL, /* free_screen */
+ NULL, /* show_screen */
+ NULL, /* load_font */
+ NULL, /* pollc */
+ NULL /* scroll */
+};
+
+static inline void
+pm2fb_wait(struct pm2fb_softc *sc, int slots)
+{
+ uint32_t reg;
+
+ do {
+ reg = bus_space_read_4(sc->sc_memt, sc->sc_regh,
+ PM2_INPUT_FIFO_SPACE);
+ } while (reg <= slots);
+}
+
+static void
+pm2fb_flush_engine(struct pm2fb_softc *sc)
+{
+
+ pm2fb_wait(sc, 2);
+
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_FILTER_MODE,
+ PM2FLT_PASS_SYNC);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_SYNC, 0);
+ do {
+ while (bus_space_read_4(sc->sc_memt, sc->sc_regh,
+ PM2_OUTPUT_FIFO_WORDS) == 0);
+ } while (bus_space_read_4(sc->sc_memt, sc->sc_regh, PM2_OUTPUT_FIFO) !=
+ 0x188);
+}
+
+static int
+pm2fb_match(device_t parent, cfdata_t match, void *aux)
+{
+ struct pci_attach_args *pa = (struct pci_attach_args *)aux;
+
+ if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY)
+ return 0;
+ if (PCI_VENDOR(pa->pa_id) != PCI_VENDOR_3DLABS)
+ return 0;
+
+ /* only cards tested on so far - likely need a list */
+ if ((PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_3DLABS_PERMEDIA2) ||
+ (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_3DLABS_PERMEDIA2V))
+ return 100;
+ return (0);
+}
+
+static void
+pm2fb_attach(device_t parent, device_t self, void *aux)
+{
+ struct pm2fb_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;
+
+ 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)) {
+ aprint_error("%s: no width property\n", device_xname(self));
+ return;
+ }
+ if (!prop_dictionary_get_uint32(dict, "height", &sc->sc_height)) {
+ aprint_error("%s: no height property\n", device_xname(self));
+ return;
+ }
+ if (!prop_dictionary_get_uint32(dict, "depth", &sc->sc_depth)) {
+ aprint_error("%s: no depth property\n", device_xname(self));
+ return;
+ }
+ /*
+ * don't look at the linebytes property - The Raptor firmware lies
+ * about it. Get it from width * depth >> 3 instead.
+ */
+ sc->sc_stride = sc->sc_width * (sc->sc_depth >> 3);
+
+ prop_dictionary_get_bool(dict, "is_console", &is_console);
+
+ if (pci_mapreg_map(pa, 0x14, PCI_MAPREG_TYPE_MEM,
+ BUS_SPACE_MAP_LINEAR,
+ &sc->sc_memt, &sc->sc_fbh, &sc->sc_fb, &sc->sc_fbsize)) {
+ aprint_error("%s: failed to map the frame buffer.\n",
+ device_xname(sc->sc_dev));
+ }
+ sc->sc_fbaddr = bus_space_vaddr(sc->sc_memt, sc->sc_fbh);
+
+ if (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_MEM, 0,
+ &sc->sc_memt, &sc->sc_regh, &sc->sc_reg, &sc->sc_regsize)) {
+ aprint_error("%s: failed to map registers.\n",
+ device_xname(sc->sc_dev));
+ }
+
+ /*
+ * XXX yeah, casting the fb address to uint32_t is formally wrong
+ * but as far as I know there are no PM2 with 64bit BARs
+ */
+ aprint_normal("%s: %d MB aperture at 0x%08x\n", device_xname(self),
+ (int)(sc->sc_fbsize >> 20), (uint32_t)sc->sc_fb);
+
+ sc->sc_defaultscreen_descr = (struct wsscreen_descr){
+ "default",
+ 0, 0,
+ NULL,
+ 8, 16,
+ WSSCREEN_WSCOLORS | WSSCREEN_HILIT,
+ NULL
+ };
+ sc->sc_screens[0] = &sc->sc_defaultscreen_descr;
+ sc->sc_screenlist = (struct wsscreen_list){1, sc->sc_screens};
+ sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
+ sc->sc_locked = 0;
+
+ vcons_init(&sc->vd, sc, &sc->sc_defaultscreen_descr,
+ &pm2fb_accessops);
+ sc->vd.init_screen = pm2fb_init_screen;
+
+ /* init engine here */
+ pm2fb_init(sc);
+
+ ri = &sc->sc_console_screen.scr_ri;
+
+ j = 0;
+ for (i = 0; i < (1 << sc->sc_depth); i++) {
+
+ sc->sc_cmap_red[i] = rasops_cmap[j];
+ sc->sc_cmap_green[i] = rasops_cmap[j + 1];
+ sc->sc_cmap_blue[i] = rasops_cmap[j + 2];
+ pm2fb_putpalreg(sc, i, rasops_cmap[j], rasops_cmap[j + 1],
+ rasops_cmap[j + 2]);
+ j += 3;
+ }
+
+ if (is_console) {
+ vcons_init_screen(&sc->vd, &sc->sc_console_screen, 1,
+ &defattr);
+ sc->sc_console_screen.scr_flags |= VCONS_SCREEN_IS_STATIC;
+
+ pm2fb_rectfill(sc, 0, 0, sc->sc_width, sc->sc_height,
+ ri->ri_devcmap[(defattr >> 16) & 0xff]);
+ sc->sc_defaultscreen_descr.textops = &ri->ri_ops;
+ sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
+ sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
+ sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
+ wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, 0,
+ defattr);
+ vcons_replay_msgbuf(&sc->sc_console_screen);
+ } else {
+ /*
+ * 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 = &pm2fb_accessops;
+ aa.accesscookie = &sc->vd;
+
+ config_found(sc->sc_dev, &aa, wsemuldisplaydevprint);
+
+ printf("ap1 register: %08x\n", bus_space_read_4(sc->sc_memt,
+ sc->sc_regh, PM2_APERTURE1_CONTROL));
+
+}
+
+static int
+pm2fb_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
+ struct lwp *l)
+{
+ struct vcons_data *vd = v;
+ struct pm2fb_softc *sc = vd->cookie;
+ struct wsdisplay_fbinfo *wdf;
+ struct vcons_screen *ms = vd->active;
+
+ switch (cmd) {
+
+ case WSDISPLAYIO_GTYPE:
+ *(u_int *)data = WSDISPLAY_TYPE_PCIMISC;
+ return 0;
+
+ /* PCI config read/write passthrough. */
+ case PCI_IOC_CFGREAD:
+ case PCI_IOC_CFGWRITE:
+ return (pci_devioctl(sc->sc_pc, sc->sc_pcitag,
+ cmd, data, flag, l));
+
+ case WSDISPLAYIO_GINFO:
+ if (ms == NULL)
+ return ENODEV;
+ wdf = (void *)data;
+ wdf->height = ms->scr_ri.ri_height;
+ wdf->width = ms->scr_ri.ri_width;
+ wdf->depth = ms->scr_ri.ri_depth;
+ wdf->cmsize = 256;
+ return 0;
+
+ case WSDISPLAYIO_GETCMAP:
+ return pm2fb_getcmap(sc,
+ (struct wsdisplay_cmap *)data);
+
+ case WSDISPLAYIO_PUTCMAP:
+ return pm2fb_putcmap(sc,
+ (struct wsdisplay_cmap *)data);
+
+ case WSDISPLAYIO_LINEBYTES:
+ *(u_int *)data = sc->sc_stride;
+ return 0;
+
+ case WSDISPLAYIO_SMODE:
+ {
+ int new_mode = *(int*)data;
+
+ /* notify the bus backend */
+ if (new_mode != sc->sc_mode) {
+ sc->sc_mode = new_mode;
+ if(new_mode == WSDISPLAYIO_MODE_EMUL) {
+ pm2fb_restore_palette(sc);
+ vcons_redraw_screen(ms);
+ }
+ }
+ }
+ return 0;
+ }
+ return EPASSTHROUGH;
+}
+
+static paddr_t
+pm2fb_mmap(void *v, void *vs, off_t offset, int prot)
+{
+ struct vcons_data *vd = v;
+ struct pm2fb_softc *sc = vd->cookie;
+ paddr_t pa;
+
+ /* 'regular' framebuffer mmap()ing */
+ if (offset < sc->sc_fbsize) {
+ pa = bus_space_mmap(sc->sc_memt, sc->sc_fb + offset, 0, prot,
+ BUS_SPACE_MAP_LINEAR);
+ return pa;
+ }
+
+ /*
+ * restrict all other mappings to processes with superuser privileges
+ * or the kernel itself
+ */
+ if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
+ NULL) != 0) {
+ aprint_normal("%s: mmap() rejected.\n",
+ device_xname(sc->sc_dev));
+ return -1;
+ }
+
+ if ((offset >= sc->sc_fb) && (offset < (sc->sc_fb + sc->sc_fbsize))) {
+ pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
+ BUS_SPACE_MAP_LINEAR);
+ return pa;
+ }
+
+ if ((offset >= sc->sc_reg) &&
+ (offset < (sc->sc_reg + sc->sc_regsize))) {
+ pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
+ BUS_SPACE_MAP_LINEAR);
+ return pa;
+ }
+
+#ifdef PCI_MAGIC_IO_RANGE
+ /* allow mapping of IO space */
+ if ((offset >= PCI_MAGIC_IO_RANGE) &&
+ (offset < PCI_MAGIC_IO_RANGE + 0x10000)) {
+ pa = bus_space_mmap(sc->sc_iot, offset - PCI_MAGIC_IO_RANGE,
+ 0, prot, BUS_SPACE_MAP_LINEAR);
+ return pa;
+ }
+#endif
+
+#ifdef OFB_ALLOW_OTHERS
+ if (offset >= 0x80000000) {
+ pa = bus_space_mmap(sc->sc_memt, offset, 0, prot,
+ BUS_SPACE_MAP_LINEAR);
+ return pa;
+ }
+#endif
+ return -1;
+}
+
+static void
+pm2fb_init_screen(void *cookie, struct vcons_screen *scr,
+ int existing, long *defattr)
+{
+ struct pm2fb_softc *sc = cookie;
+ struct rasops_info *ri = &scr->scr_ri;
+
+ ri->ri_depth = sc->sc_depth;
+ ri->ri_width = sc->sc_width;
+ ri->ri_height = sc->sc_height;
+ ri->ri_stride = sc->sc_stride;
+ ri->ri_flg = RI_CENTER | RI_FULLCLEAR;
+
+ ri->ri_bits = (char *)sc->sc_fbaddr;
+
+ if (existing) {
+ ri->ri_flg |= RI_CLEAR;
+ }
+
+ rasops_init(ri, sc->sc_height / 8, sc->sc_width / 8);
+ ri->ri_caps = WSSCREEN_WSCOLORS;
+
+ rasops_reconfig(ri, sc->sc_height / ri->ri_font->fontheight,
+ sc->sc_width / ri->ri_font->fontwidth);
+
+ ri->ri_hw = scr;
+ ri->ri_ops.copyrows = pm2fb_copyrows;
+ ri->ri_ops.copycols = pm2fb_copycols;
+ ri->ri_ops.cursor = pm2fb_cursor;
+ ri->ri_ops.eraserows = pm2fb_eraserows;
+ ri->ri_ops.erasecols = pm2fb_erasecols;
+#if 0
+ ri->ri_ops.putchar = pm2fb_putchar;
+#endif
+}
+
+static int
+pm2fb_putcmap(struct pm2fb_softc *sc, struct wsdisplay_cmap *cm)
+{
+ u_char *r, *g, *b;
+ u_int index = cm->index;
+ u_int count = cm->count;
+ int i, error;
+ u_char rbuf[256], gbuf[256], bbuf[256];
+
+#ifdef PM2FB_DEBUG
+ aprint_debug("putcmap: %d %d\n",index, count);
+#endif
+ if (cm->index >= 256 || cm->count > 256 ||
+ (cm->index + cm->count) > 256)
+ return EINVAL;
+ error = copyin(cm->red, &rbuf[index], count);
+ if (error)
+ return error;
+ error = copyin(cm->green, &gbuf[index], count);
+ if (error)
+ return error;
+ error = copyin(cm->blue, &bbuf[index], count);
+ if (error)
+ return error;
+
+ memcpy(&sc->sc_cmap_red[index], &rbuf[index], count);
+ memcpy(&sc->sc_cmap_green[index], &gbuf[index], count);
+ memcpy(&sc->sc_cmap_blue[index], &bbuf[index], count);
+
+ r = &sc->sc_cmap_red[index];
+ g = &sc->sc_cmap_green[index];
+ b = &sc->sc_cmap_blue[index];
+
+ for (i = 0; i < count; i++) {
+ pm2fb_putpalreg(sc, index, *r, *g, *b);
+ index++;
+ r++, g++, b++;
+ }
+ return 0;
+}
+
+static int
+pm2fb_getcmap(struct pm2fb_softc *sc, struct wsdisplay_cmap *cm)
+{
+ u_int index = cm->index;
+ u_int count = cm->count;
+ int error;
+
+ if (index >= 255 || count > 256 || index + count > 256)
+ return EINVAL;
+
+ error = copyout(&sc->sc_cmap_red[index], cm->red, count);
+ if (error)
+ return error;
+ error = copyout(&sc->sc_cmap_green[index], cm->green, count);
+ if (error)
+ return error;
+ error = copyout(&sc->sc_cmap_blue[index], cm->blue, count);
+ if (error)
+ return error;
+
+ return 0;
+}
+
+static void
+pm2fb_restore_palette(struct pm2fb_softc *sc)
+{
+ int i;
+
+ for (i = 0; i < (1 << sc->sc_depth); i++) {
+ pm2fb_putpalreg(sc, i, sc->sc_cmap_red[i],
+ sc->sc_cmap_green[i], sc->sc_cmap_blue[i]);
+ }
+}
+
+static int
+pm2fb_putpalreg(struct pm2fb_softc *sc, uint8_t idx, uint8_t r, uint8_t g,
+ uint8_t b)
+{
+ bus_space_write_1(sc->sc_memt, sc->sc_regh, PM2_DAC_PAL_WRITE_IDX, idx);
+ bus_space_write_1(sc->sc_memt, sc->sc_regh, PM2_DAC_DATA, r);
+ bus_space_write_1(sc->sc_memt, sc->sc_regh, PM2_DAC_DATA, g);
+ bus_space_write_1(sc->sc_memt, sc->sc_regh, PM2_DAC_DATA, b);
+ return 0;
+}
+
+static void
+pm2fb_init(struct pm2fb_softc *sc)
+{
+#if 0
+ uint32_t datatype;
+#endif
+ pm2fb_flush_engine(sc);
+
+ pm2fb_wait(sc, 8);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_SCREEN_BASE, 0);
+#if 0
+ switch (sc->sc_depth) {
+ case 8:
+ datatype = R128_GMC_DST_8BPP_CI;
+ break;
+ case 15:
+ datatype = R128_GMC_DST_15BPP;
+ break;
+ case 16:
+ datatype = R128_GMC_DST_16BPP;
+ break;
+ case 24:
+ datatype = R128_GMC_DST_24BPP;
+ break;
+ case 32:
+ datatype = R128_GMC_DST_32BPP;
+ break;
+ default:
+ aprint_error("%s: unsupported depth %d\n",
+ device_xname(sc->sc_dev), sc->sc_depth);
+ return;
+ }
+ sc->sc_master_cntl = R128_GMC_CLR_CMP_CNTL_DIS |
+ R128_GMC_AUX_CLIP_DIS | datatype;
+#endif
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_BYPASS_MASK,
+ 0xffffffff);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_FB_WRITE_MASK,
+ 0xffffffff);
+ pm2fb_flush_engine(sc);
+}
+
+static void
+pm2fb_rectfill(struct pm2fb_softc *sc, int x, int y, int wi, int he,
+ uint32_t colour)
+{
+
+ pm2fb_wait(sc, 6);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_CONFIG,
+ PM2RECFG_WRITE_EN);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_CONST_COLOUR,
+ colour);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RECT_START,
+ (y << 16) | x);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RECT_SIZE,
+ (he << 16) | wi);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RENDER,
+ PM2RE_RECTANGLE);
+
+ pm2fb_flush_engine(sc);
+}
+
+static void
+pm2fb_bitblt(struct pm2fb_softc *sc, int xs, int ys, int xd, int yd,
+ int wi, int he, int rop)
+{
+ uint32_t dir = 0;
+
+ pm2fb_wait(sc, 5);
+
+ if (yd <= ys) {
+ dir |= PM2RE_INC_Y;
+ }
+ if (xd <= xs) {
+ dir |= PM2RE_INC_X;
+ }
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_CONFIG,
+ PM2RECFG_READ_SRC | PM2RECFG_WRITE_EN | PM2RECFG_ROP_EN |
+ (rop << 6));
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RECT_START,
+ (yd << 16) | xd);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RECT_SIZE,
+ (he << 16) | wi);
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_SOURCE_DELTA,
+ (((ys - yd) & 0xfff) << 16) | ((xs - xd) & 0xfff));
+ bus_space_write_4(sc->sc_memt, sc->sc_regh, PM2_RE_RENDER,
+ PM2RE_RECTANGLE | dir);
+ pm2fb_flush_engine(sc);
+}
+
+static void
+pm2fb_cursor(void *cookie, int on, int row, int col)
+{
+ struct rasops_info *ri = cookie;
+ struct vcons_screen *scr = ri->ri_hw;
+ struct pm2fb_softc *sc = scr->scr_cookie;
+ int x, y, wi, he;
+
+ wi = ri->ri_font->fontwidth;
+ he = ri->ri_font->fontheight;
+
+ if (sc->sc_mode == WSDISPLAYIO_MODE_EMUL) {
+ x = ri->ri_ccol * wi + ri->ri_xorigin;
+ y = ri->ri_crow * he + ri->ri_yorigin;
+ if (ri->ri_flg & RI_CURSOR) {
+ pm2fb_bitblt(sc, x, y, x, y, wi, he, 12);
+ ri->ri_flg &= ~RI_CURSOR;
+ }
+ ri->ri_crow = row;
+ ri->ri_ccol = col;
+ if (on) {
+ x = ri->ri_ccol * wi + ri->ri_xorigin;
+ y = ri->ri_crow * he + ri->ri_yorigin;
+ pm2fb_bitblt(sc, x, y, x, y, wi, he, 12);
+ ri->ri_flg |= RI_CURSOR;
+ }
+ } else {
+ scr->scr_ri.ri_crow = row;
+ scr->scr_ri.ri_ccol = col;
+ scr->scr_ri.ri_flg &= ~RI_CURSOR;
+ }
+
+}
+
+#if 0
+static void
+pm2fb_putchar(void *cookie, int row, int col, u_int c, long attr)
+{
+}
+#endif
+
+static void
+pm2fb_copycols(void *cookie, int row, int srccol, int dstcol, int ncols)
+{
+ struct rasops_info *ri = cookie;
+ struct vcons_screen *scr = ri->ri_hw;
+ struct pm2fb_softc *sc = scr->scr_cookie;
+ int32_t xs, xd, y, width, height;
+
+ if ((sc->sc_locked == 0) && (sc->sc_mode == WSDISPLAYIO_MODE_EMUL)) {
+ xs = ri->ri_xorigin + ri->ri_font->fontwidth * srccol;
+ xd = ri->ri_xorigin + ri->ri_font->fontwidth * dstcol;
+ y = ri->ri_yorigin + ri->ri_font->fontheight * row;
+ width = ri->ri_font->fontwidth * ncols;
+ height = ri->ri_font->fontheight;
+ pm2fb_bitblt(sc, xs, y, xd, y, width, height, 3);
+ }
+}
+
+static void
+pm2fb_erasecols(void *cookie, int row, int startcol, int ncols, long fillattr)
+{
+ struct rasops_info *ri = cookie;
+ struct vcons_screen *scr = ri->ri_hw;
+ struct pm2fb_softc *sc = scr->scr_cookie;
+ int32_t x, y, width, height, fg, bg, ul;
+
+ if ((sc->sc_locked == 0) && (sc->sc_mode == WSDISPLAYIO_MODE_EMUL)) {
+ x = ri->ri_xorigin + ri->ri_font->fontwidth * startcol;
+ y = ri->ri_yorigin + ri->ri_font->fontheight * row;
+ width = ri->ri_font->fontwidth * ncols;
+ height = ri->ri_font->fontheight;
+ rasops_unpack_attr(fillattr, &fg, &bg, &ul);
+
+ pm2fb_rectfill(sc, x, y, width, height, ri->ri_devcmap[bg]);
+ }
+}
+
+static void
+pm2fb_copyrows(void *cookie, int srcrow, int dstrow, int nrows)
+{
+ struct rasops_info *ri = cookie;
+ struct vcons_screen *scr = ri->ri_hw;
+ struct pm2fb_softc *sc = scr->scr_cookie;
+ int32_t x, ys, yd, width, height;
+
+ if ((sc->sc_locked == 0) && (sc->sc_mode == WSDISPLAYIO_MODE_EMUL)) {
+ x = ri->ri_xorigin;
+ ys = ri->ri_yorigin + ri->ri_font->fontheight * srcrow;
+ yd = ri->ri_yorigin + ri->ri_font->fontheight * dstrow;
+ width = ri->ri_emuwidth;
+ height = ri->ri_font->fontheight*nrows;
+ pm2fb_bitblt(sc, x, ys, x, yd, width, height, 3);
+ }
+}
+
+static void
+pm2fb_eraserows(void *cookie, int row, int nrows, long fillattr)
+{
+ struct rasops_info *ri = cookie;
+ struct vcons_screen *scr = ri->ri_hw;
+ struct pm2fb_softc *sc = scr->scr_cookie;
+ 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);
+
+ pm2fb_rectfill(sc, x, y, width, height, ri->ri_devcmap[bg]);
+ }
+}
+
Index: src/sys/dev/pci/pm2reg.h
diff -u /dev/null src/sys/dev/pci/pm2reg.h:1.1
--- /dev/null Wed Oct 28 02:10:27 2009
+++ src/sys/dev/pci/pm2reg.h Wed Oct 28 02:10:27 2009
@@ -0,0 +1,133 @@
+/* $NetBSD: pm2reg.h,v 1.1 2009/10/28 02:10:27 macallan Exp $ */
+
+/*
+ * Copyright (c) 2009 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * 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.
+ */
+
+/*
+ * register definitions for Permedia 2 graphics controllers
+ */
+
+
+#ifndef PM2_REG_H
+#define PM2_REG_H
+
+#define PM2_RESET 0x00000000 /* any write initiates a chip reset */
+#define PM2_RESET_BUSY 0x80000000 /* reset in progress */
+
+#define PM2_INPUT_FIFO_SPACE 0x00000018
+#define PM2_OUTPUT_FIFO_WORDS 0x00000020
+
+#define PM2_APERTURE1_CONTROL 0x00000050
+#define PM2_APERTURE2_CONTROL 0x00000058
+#define PM2_AP_BYTESWAP 0x00000001
+#define PM2_AP_HALFWORDSWAP 0x00000002
+#define PM2_AP_PACKED16_EN 0x00000008
+#define PM2_AP_PACKED16_READ_B 0x00000010 /* Buffer A otherwise */
+#define PM2_AP_PACKED16_WRITE_B 0x00000020 /* A otherwise */
+#define PM2_AP_PACKED16_WRT_DBL 0x00000040
+#define PM2_AP_PACKED16_R31 0x00000080 /* read buffer selected by
+ * visibility bit in memory
+ */
+#define PM2_AP_SVGA 0x00000100
+#define PM2_AP_ROM 0x00000200
+
+#define PM2_BYPASS_MASK 0x00001100
+#define PM2_FB_WRITE_MASK 0x00001140
+
+#define PM2_OUTPUT_FIFO 0x00002000
+
+#define PM2_SCREEN_BASE 0x00003000 /* in 64bit units */
+#define PM2_SCREEN_STRIDE 0x00003008 /* in 64bit units */
+
+/* RAMDAC */
+#define PM2_DAC_PAL_WRITE_IDX 0x00004000
+#define PM2_DAC_DATA 0x00004008
+#define PM2_DAC_MASK 0x00004010
+#define PM2_DAC_PAL_READ 0x00004018
+#define PM2_DAC_CURSOR_PAL 0x00004020
+#define PM2_DAC_CURSOR_DATA 0x00004028
+#define PM2_DAC_INDEX_DATA 0x00004050
+#define PM2_DAC_CURSOR_RAM 0x00004058
+#define PM2_DAC_CURSOR_X_LOW 0x00004060
+#define PM2_DAC_CURSOR_X_HIGH 0x00004068
+#define PM2_DAC_CURSOR_Y_LOW 0x00004070
+#define PM2_DAC_CURSOR_Y_HIGH 0x00004078
+
+/* drawing engine */
+#define PM2_RE_BITMASK 0x00008068 /* for colour expansion */
+#define PM2_RE_COLOUR 0x000087f0
+#define PM2_RE_CONFIG 0x00008d90
+#define PM2RECFG_READ_SRC 0x00000001
+#define PM2RECFG_READ_DST 0x00000002
+#define PM2RECFG_PACKED 0x00000004
+#define PM2RECFG_WRITE_EN 0x00000008
+#define PM2RECFG_DDA_EN 0x00000010
+#define PM2RECFG_ROP_EN 0x00000020
+#define PM2RECFG_ROP_MASK 0x000003c0
+#define PM2RECFG_ROP_SHIFT 6
+
+#define PM2_RE_CONST_COLOUR 0x000087e8
+#define PM2_RE_BUFFER_OFFSET 0x00008a90 /* distance between src and dst */
+#define PM2_RE_SOURCE_BASE 0x00008d80 /* write after windowbase */
+#define PM2_RE_SOURCE_DELTA 0x00008d88 /* offset in coordinates */
+#define PM2_RE_SOURCE_OFFSET 0x00008a88 /* same in pixels */
+#define PM2_RE_WINDOW_BASE 0x00008ab0
+#define PM2_RE_WRITE_MODE 0x00008ab8
+#define PM2WM_WRITE_EN 0x00000001
+#define PM2WM_TO_HOST 0x00000008
+
+#define PM2_RE_MODE 0x000080a0
+#define PM2RM_MASK_MIRROR 0x00000001 /* mask is right-to-left */
+#define PM2RM_MASK_INVERT
+#define PM2RM_MASK_OPAQUE 0x00000040 /* BG in TEXEL0 */
+#define PM2RM_MASK_SWAP 0x00000180
+#define PM2RM_MASK_PAD 0x00000200 /* new line new mask */
+#define PM2RM_MASK_OFFSET 0x00007c00
+#define PM2RM_HOST_SWAP 0x00018000
+#define PM2RM_LIMITS_EN 0x00040000
+#define PM2RM_MASK_REL_X 0x00080000
+
+#define PM2_RE_RECT_START 0x000080d0
+#define PM2_RE_RECT_SIZE 0x000080d8
+#define PM2_RE_RENDER 0x00008038 /* write starts command */
+#define PM2RE_STIPPLE 0x00000001
+#define PM2RE_FASTFILL 0x00000008
+#define PM2RE_LINE 0x00000000
+#define PM2RE_TRAPEZOID 0x00000040
+#define PM2RE_POINT 0x00000080
+#define PM2RE_RECTANGLE 0x000000c0
+#define PM2RE_SYNC_ON_MASK 0x00000800 /* wait for write to bitmask
+ register */
+#define PM2RE_SYNC_ON_HOST 0x00001000 /* wait for host data */
+#define PM2RE_TEXTURE_EN 0x00002000
+#define PM2RE_INC_X 0x00200000 /* drawing direction */
+#define PM2RE_INC_Y 0x00400000
+#define PM2_RE_TEXEL0 0x00008600 /* background colour */
+#define PM2_RE_STATUS 0x00000068
+#define PM2ST_BUSY 0x80000000
+#define PM2_RE_SYNC 0x00008c40
+#define PM2_RE_FILTER_MODE 0x00008c00
+#define PM2FLT_PASS_SYNC 0x00000400
+#endif /* PM2_REG_H */
