diff options
| -rw-r--r-- | sys/dev/pci/vga_pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/vesa/vesabios.c | 4 | ||||
| -rw-r--r-- | sys/dev/vesa/vesabiosvar.h | 3 | ||||
| -rw-r--r-- | sys/dev/vesa/vesafb.c | 27 |
4 files changed, 25 insertions, 15 deletions
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index d664b518569..bcc426dc89f 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_pci.c,v 1.25 2006/11/27 18:04:28 gwk Exp $ */ +/* $OpenBSD: vga_pci.c,v 1.26 2007/01/28 20:28:50 gwk Exp $ */ /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */ /* @@ -175,7 +175,7 @@ vga_pci_attach(struct device *parent, struct device *self, void *aux) return; } #endif - printf("\n"); + printf("\n"); vga_common_attach(self, pa->pa_iot, pa->pa_memt, WSDISPLAY_TYPE_PCIVGA); } @@ -188,6 +188,8 @@ vga_pci_mmap(void *v, off_t off, int prot) struct vga_pci_softc *sc = (struct vga_pci_softc *)vc->vc_softc; if (sc->sc_mode == WSDISPLAYIO_MODE_DUMBFB) { + if (off < 0 || off > vesabios_softc->sc_size) + return (-1); return atop(sc->sc_base + off); } #endif diff --git a/sys/dev/vesa/vesabios.c b/sys/dev/vesa/vesabios.c index 4dc34a49921..8fdde7aa962 100644 --- a/sys/dev/vesa/vesabios.c +++ b/sys/dev/vesa/vesabios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vesabios.c,v 1.2 2006/12/02 13:26:15 matthieu Exp $ */ +/* $OpenBSD: vesabios.c,v 1.3 2007/01/28 20:28:50 gwk Exp $ */ /* * Copyright (c) 2002, 2004 @@ -194,6 +194,8 @@ vesabios_attach(struct device *parent, struct device *self, void *aux) res = kvm86_bios_read(FAR2FLATPTR(vi->OemVendorNamePtr), name, sizeof(name)); + + sc->sc_size = vi->TotalMemory * 65536; if (res > 0) { name[res - 1] = 0; printf(", %s", name); diff --git a/sys/dev/vesa/vesabiosvar.h b/sys/dev/vesa/vesabiosvar.h index 38db88e8901..f48a5114694 100644 --- a/sys/dev/vesa/vesabiosvar.h +++ b/sys/dev/vesa/vesabiosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vesabiosvar.h,v 1.1 2006/11/27 18:04:28 gwk Exp $ */ +/* $OpenBSD: vesabiosvar.h,v 1.2 2007/01/28 20:28:50 gwk Exp $ */ /* * Copyright (c) 2006 Matthieu Herrb @@ -21,6 +21,7 @@ extern int vbeprobe(void); struct vesabios_softc { struct device sc_dev; int sc_nmodes; + uint32_t sc_size; uint16_t *sc_modes; }; diff --git a/sys/dev/vesa/vesafb.c b/sys/dev/vesa/vesafb.c index 701a1157fb1..9d0598572ce 100644 --- a/sys/dev/vesa/vesafb.c +++ b/sys/dev/vesa/vesafb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vesafb.c,v 1.2 2006/12/02 20:20:55 matthieu Exp $ */ +/* $OpenBSD: vesafb.c,v 1.3 2007/01/28 20:28:50 gwk Exp $ */ /*- * Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca> @@ -112,7 +112,10 @@ vesafb_get_mode_info(struct vga_pci_softc *sc, int mode, unsigned char *buf; int res; - buf = kvm86_bios_addpage(0x2000); + if ((buf = kvm86_bios_addpage(0x2000)) == NULL) { + printf("%s: kvm86_bios_addpage(0x2000) failed.\n"); + return; + } memset(&tf, 0, sizeof(struct trapframe)); tf.tf_eax = 0x4f01; /* function code */ tf.tf_ecx = mode; @@ -123,8 +126,9 @@ vesafb_get_mode_info(struct vga_pci_softc *sc, int mode, if (res || (tf.tf_eax & 0xff) != 0x4f) { printf("%s: vbecall: res=%d, ax=%x\n", sc->sc_dev.dv_xname, res, tf.tf_eax); - printf("%s: error getting info for mode %04x\n", + printf("%s: error getting info for mode %05x\n", sc->sc_dev.dv_xname, mode); + kvm86_bios_delpage(0x2000, buf); return; } memcpy(mi, buf, sizeof(struct modeinfoblock)); @@ -138,8 +142,10 @@ vesafb_set_palette(struct vga_pci_softc *sc, int reg, struct paletteentry pe) int res; char *buf; - buf = kvm86_bios_addpage(0x2000); - + if ((buf = kvm86_bios_addpage(0x2000)) == NULL) { + printf("%s: kvm86_bios_addpage(0x2000) failed.\n"); + return; + } /* * this function takes 8 bit per palette as input, but we're * working in 6 bit mode here @@ -229,7 +235,7 @@ vesafb_putcmap(struct vga_pci_softc *sc, struct wsdisplay_cmap *cm) idx = cm->index; cnt = cm->count; - if (idx >= 255 || cnt > 256 || idx + cnt > 256) + if (idx >= 256 || cnt > 256 - idx) return EINVAL; rv = copyin(cm->red, &r[idx], cnt); @@ -272,7 +278,7 @@ vesafb_getcmap(struct vga_pci_softc *sc, struct wsdisplay_cmap *cm) idx = cm->index; cnt = cm->count; - if (idx >= 255 || cnt > 256 || idx + cnt > 256) + if (idx >= 256 || cnt > 256 - idx) return EINVAL; rv = copyout(&sc->sc_cmap_red[idx], cm->red, cnt); @@ -292,8 +298,7 @@ static int vesafb_getdepthflag(struct modeinfoblock *mi) { int bpp, depth; - - + depth = mi->RedMaskSize + mi->GreenMaskSize + mi->BlueMaskSize; bpp = mi->BitsPerPixel; switch (depth) { @@ -326,10 +331,10 @@ vesafb_get_supported_depth(struct vga_pci_softc *sc) struct modeinfoblock mi; depths = 0; - + if (vesabios_softc == NULL || vesabios_softc->sc_nmodes == 0) return 0; - + for (i = 0; i < vesabios_softc->sc_nmodes; i++) { vesafb_get_mode_info(sc, vesabios_softc->sc_modes[i], &mi); depths |= vesafb_getdepthflag(&mi); |