Index: stable/12/sys/arm/broadcom/bcm2835/bcm2835_fbd.c =================================================================== --- stable/12/sys/arm/broadcom/bcm2835/bcm2835_fbd.c (revision 361898) +++ stable/12/sys/arm/broadcom/bcm2835/bcm2835_fbd.c (revision 361899) @@ -1,278 +1,284 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2012 Oleksandr Tymoshenko * Copyright (c) 2012, 2013 The FreeBSD Foundation * All rights reserved. * * Portions of this software were developed by Oleksandr Rybalko * under sponsorship from the FreeBSD Foundation. * * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. * */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "fb_if.h" #include "mbox_if.h" #define FB_DEPTH 24 struct bcmsc_softc { struct fb_info info; int fbswap; struct bcm2835_fb_config fb; device_t dev; }; static struct ofw_compat_data compat_data[] = { {"broadcom,bcm2835-fb", 1}, {"brcm,bcm2708-fb", 1}, {NULL, 0} }; static int bcm_fb_probe(device_t); static int bcm_fb_attach(device_t); static int bcm_fb_init(struct bcmsc_softc *sc, struct bcm2835_fb_config *fb) { int err; err = 0; memset(fb, 0, sizeof(*fb)); if (bcm2835_mbox_fb_get_w_h(fb) != 0) return (ENXIO); - fb->bpp = FB_DEPTH; + if (bcm2835_mbox_fb_get_bpp(fb) != 0) + return (ENXIO); + if (fb->bpp < FB_DEPTH) { + device_printf(sc->dev, "changing fb bpp from %d to %d\n", fb->bpp, FB_DEPTH); + fb->bpp = FB_DEPTH; + } else + device_printf(sc->dev, "keeping existing fb bpp of %d\n", fb->bpp); fb->vxres = fb->xres; fb->vyres = fb->yres; fb->xoffset = fb->yoffset = 0; if ((err = bcm2835_mbox_fb_init(fb)) != 0) { device_printf(sc->dev, "bcm2835_mbox_fb_init failed, err=%d\n", err); return (ENXIO); } return (0); } static int bcm_fb_setup_fbd(struct bcmsc_softc *sc) { struct bcm2835_fb_config fb; device_t fbd; int err; err = bcm_fb_init(sc, &fb); if (err) return (err); memset(&sc->info, 0, sizeof(sc->info)); sc->info.fb_name = device_get_nameunit(sc->dev); sc->info.fb_vbase = (intptr_t)pmap_mapdev(fb.base, fb.size); sc->info.fb_pbase = fb.base; sc->info.fb_size = fb.size; sc->info.fb_bpp = sc->info.fb_depth = fb.bpp; sc->info.fb_stride = fb.pitch; sc->info.fb_width = fb.xres; sc->info.fb_height = fb.yres; #ifdef VM_MEMATTR_WRITE_COMBINING sc->info.fb_flags = FB_FLAG_MEMATTR; sc->info.fb_memattr = VM_MEMATTR_WRITE_COMBINING; #endif if (sc->fbswap) { switch (sc->info.fb_bpp) { case 24: vt_generate_cons_palette(sc->info.fb_cmap, COLOR_FORMAT_RGB, 0xff, 0, 0xff, 8, 0xff, 16); sc->info.fb_cmsize = 16; break; case 32: vt_generate_cons_palette(sc->info.fb_cmap, COLOR_FORMAT_RGB, 0xff, 16, 0xff, 8, 0xff, 0); sc->info.fb_cmsize = 16; break; } } fbd = device_add_child(sc->dev, "fbd", device_get_unit(sc->dev)); if (fbd == NULL) { device_printf(sc->dev, "Failed to add fbd child\n"); pmap_unmapdev(sc->info.fb_vbase, sc->info.fb_size); return (ENXIO); } else if (device_probe_and_attach(fbd) != 0) { device_printf(sc->dev, "Failed to attach fbd device\n"); device_delete_child(sc->dev, fbd); pmap_unmapdev(sc->info.fb_vbase, sc->info.fb_size); return (ENXIO); } device_printf(sc->dev, "%dx%d(%dx%d@%d,%d) %dbpp\n", fb.xres, fb.yres, fb.vxres, fb.vyres, fb.xoffset, fb.yoffset, fb.bpp); device_printf(sc->dev, "fbswap: %d, pitch %d, base 0x%08x, screen_size %d\n", sc->fbswap, fb.pitch, fb.base, fb.size); return (0); } static int bcm_fb_resync_sysctl(SYSCTL_HANDLER_ARGS) { struct bcmsc_softc *sc = arg1; struct bcm2835_fb_config fb; int val; int err; val = 0; err = sysctl_handle_int(oidp, &val, 0, req); if (err || !req->newptr) /* error || read request */ return (err); bcm_fb_init(sc, &fb); return (0); } static void bcm_fb_sysctl_init(struct bcmsc_softc *sc) { struct sysctl_ctx_list *ctx; struct sysctl_oid *tree_node; struct sysctl_oid_list *tree; /* * Add system sysctl tree/handlers. */ ctx = device_get_sysctl_ctx(sc->dev); tree_node = device_get_sysctl_tree(sc->dev); tree = SYSCTL_CHILDREN(tree_node); SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "resync", CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc), bcm_fb_resync_sysctl, "IU", "Set to resync framebuffer with VC"); } static int bcm_fb_probe(device_t dev) { if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); device_set_desc(dev, "BCM2835 VT framebuffer driver"); return (BUS_PROBE_DEFAULT); } static int bcm_fb_attach(device_t dev) { char bootargs[2048], *n, *p, *v; int err; phandle_t chosen; struct bcmsc_softc *sc; sc = device_get_softc(dev); sc->dev = dev; /* Newer firmware versions needs an inverted color palette. */ sc->fbswap = 0; chosen = OF_finddevice("/chosen"); if (chosen != -1 && OF_getprop(chosen, "bootargs", &bootargs, sizeof(bootargs)) > 0) { p = bootargs; while ((v = strsep(&p, " ")) != NULL) { if (*v == '\0') continue; n = strsep(&v, "="); if (strcmp(n, "bcm2708_fb.fbswap") == 0 && v != NULL) if (*v == '1') sc->fbswap = 1; } } bcm_fb_sysctl_init(sc); err = bcm_fb_setup_fbd(sc); if (err) return (err); return (0); } static struct fb_info * bcm_fb_helper_getinfo(device_t dev) { struct bcmsc_softc *sc; sc = device_get_softc(dev); return (&sc->info); } static device_method_t bcm_fb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, bcm_fb_probe), DEVMETHOD(device_attach, bcm_fb_attach), /* Framebuffer service methods */ DEVMETHOD(fb_getinfo, bcm_fb_helper_getinfo), DEVMETHOD_END }; static devclass_t bcm_fb_devclass; static driver_t bcm_fb_driver = { "fb", bcm_fb_methods, sizeof(struct bcmsc_softc), }; DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, bcm_fb_devclass, 0, 0); DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, bcm_fb_devclass, 0, 0); Index: stable/12/sys/arm/broadcom/bcm2835/bcm2835_mbox.c =================================================================== --- stable/12/sys/arm/broadcom/bcm2835/bcm2835_mbox.c (revision 361898) +++ stable/12/sys/arm/broadcom/bcm2835/bcm2835_mbox.c (revision 361899) @@ -1,542 +1,562 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2012 Oleksandr Tymoshenko * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "mbox_if.h" #define REG_READ 0x00 #define REG_POL 0x10 #define REG_SENDER 0x14 #define REG_STATUS 0x18 #define STATUS_FULL 0x80000000 #define STATUS_EMPTY 0x40000000 #define REG_CONFIG 0x1C #define CONFIG_DATA_IRQ 0x00000001 #define REG_WRITE 0x20 /* This is Mailbox 1 address */ #define MBOX_MSG(chan, data) (((data) & ~0xf) | ((chan) & 0xf)) #define MBOX_CHAN(msg) ((msg) & 0xf) #define MBOX_DATA(msg) ((msg) & ~0xf) #define MBOX_LOCK(sc) do { \ mtx_lock(&(sc)->lock); \ } while(0) #define MBOX_UNLOCK(sc) do { \ mtx_unlock(&(sc)->lock); \ } while(0) #ifdef DEBUG #define dprintf(fmt, args...) printf(fmt, ##args) #else #define dprintf(fmt, args...) #endif struct bcm_mbox_softc { struct mtx lock; struct resource * mem_res; struct resource * irq_res; void* intr_hl; bus_space_tag_t bst; bus_space_handle_t bsh; int msg[BCM2835_MBOX_CHANS]; int have_message[BCM2835_MBOX_CHANS]; struct sx property_chan_lock; }; #define mbox_read_4(sc, reg) \ bus_space_read_4((sc)->bst, (sc)->bsh, reg) #define mbox_write_4(sc, reg, val) \ bus_space_write_4((sc)->bst, (sc)->bsh, reg, val) static struct ofw_compat_data compat_data[] = { {"broadcom,bcm2835-mbox", 1}, {"brcm,bcm2835-mbox", 1}, {NULL, 0} }; static int bcm_mbox_read_msg(struct bcm_mbox_softc *sc, int *ochan) { #ifdef DEBUG uint32_t data; #endif uint32_t msg; int chan; msg = mbox_read_4(sc, REG_READ); dprintf("bcm_mbox_intr: raw data %08x\n", msg); chan = MBOX_CHAN(msg); #ifdef DEBUG data = MBOX_DATA(msg); #endif if (sc->msg[chan]) { printf("bcm_mbox_intr: channel %d oveflow\n", chan); return (1); } dprintf("bcm_mbox_intr: chan %d, data %08x\n", chan, data); sc->msg[chan] = msg; if (ochan != NULL) *ochan = chan; return (0); } static void bcm_mbox_intr(void *arg) { struct bcm_mbox_softc *sc = arg; int chan; MBOX_LOCK(sc); while (!(mbox_read_4(sc, REG_STATUS) & STATUS_EMPTY)) if (bcm_mbox_read_msg(sc, &chan) == 0) { sc->have_message[chan] = 1; wakeup(&sc->have_message[chan]); } MBOX_UNLOCK(sc); } static int bcm_mbox_probe(device_t dev) { if (!ofw_bus_status_okay(dev)) return (ENXIO); if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) return (ENXIO); device_set_desc(dev, "BCM2835 VideoCore Mailbox"); return (BUS_PROBE_DEFAULT); } static int bcm_mbox_attach(device_t dev) { struct bcm_mbox_softc *sc = device_get_softc(dev); int i; int rid = 0; sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->mem_res == NULL) { device_printf(dev, "could not allocate memory resource\n"); return (ENXIO); } sc->bst = rman_get_bustag(sc->mem_res); sc->bsh = rman_get_bushandle(sc->mem_res); rid = 0; sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (sc->irq_res == NULL) { device_printf(dev, "could not allocate interrupt resource\n"); return (ENXIO); } /* Setup and enable the timer */ if (bus_setup_intr(dev, sc->irq_res, INTR_MPSAFE | INTR_TYPE_MISC, NULL, bcm_mbox_intr, sc, &sc->intr_hl) != 0) { bus_release_resource(dev, SYS_RES_IRQ, rid, sc->irq_res); device_printf(dev, "Unable to setup the clock irq handler.\n"); return (ENXIO); } mtx_init(&sc->lock, "vcio mbox", NULL, MTX_DEF); for (i = 0; i < BCM2835_MBOX_CHANS; i++) { sc->msg[i] = 0; sc->have_message[i] = 0; } sx_init(&sc->property_chan_lock, "mboxprop"); /* Read all pending messages */ while ((mbox_read_4(sc, REG_STATUS) & STATUS_EMPTY) == 0) (void)mbox_read_4(sc, REG_READ); mbox_write_4(sc, REG_CONFIG, CONFIG_DATA_IRQ); return (0); } /* * Mailbox API */ static int bcm_mbox_write(device_t dev, int chan, uint32_t data) { int limit = 1000; struct bcm_mbox_softc *sc = device_get_softc(dev); dprintf("bcm_mbox_write: chan %d, data %08x\n", chan, data); MBOX_LOCK(sc); sc->have_message[chan] = 0; while ((mbox_read_4(sc, REG_STATUS) & STATUS_FULL) && --limit) DELAY(5); if (limit == 0) { printf("bcm_mbox_write: STATUS_FULL stuck"); MBOX_UNLOCK(sc); return (EAGAIN); } mbox_write_4(sc, REG_WRITE, MBOX_MSG(chan, data)); MBOX_UNLOCK(sc); return (0); } static int bcm_mbox_read(device_t dev, int chan, uint32_t *data) { struct bcm_mbox_softc *sc = device_get_softc(dev); int err, read_chan; dprintf("bcm_mbox_read: chan %d\n", chan); err = 0; MBOX_LOCK(sc); if (!cold) { if (sc->have_message[chan] == 0) { if (mtx_sleep(&sc->have_message[chan], &sc->lock, 0, "mbox", 10*hz) != 0) { device_printf(dev, "timeout waiting for message on chan %d\n", chan); err = ETIMEDOUT; } } } else { do { /* Wait for a message */ while ((mbox_read_4(sc, REG_STATUS) & STATUS_EMPTY)) ; /* Read the message */ if (bcm_mbox_read_msg(sc, &read_chan) != 0) { err = EINVAL; goto out; } } while (read_chan != chan); } /* * get data from intr handler, the same channel is never coming * because of holding sc lock. */ *data = MBOX_DATA(sc->msg[chan]); sc->msg[chan] = 0; sc->have_message[chan] = 0; out: MBOX_UNLOCK(sc); dprintf("bcm_mbox_read: chan %d, data %08x\n", chan, *data); return (err); } static device_method_t bcm_mbox_methods[] = { DEVMETHOD(device_probe, bcm_mbox_probe), DEVMETHOD(device_attach, bcm_mbox_attach), DEVMETHOD(mbox_read, bcm_mbox_read), DEVMETHOD(mbox_write, bcm_mbox_write), DEVMETHOD_END }; static driver_t bcm_mbox_driver = { "mbox", bcm_mbox_methods, sizeof(struct bcm_mbox_softc), }; static devclass_t bcm_mbox_devclass; DRIVER_MODULE(mbox, simplebus, bcm_mbox_driver, bcm_mbox_devclass, 0, 0); static void bcm2835_mbox_dma_cb(void *arg, bus_dma_segment_t *segs, int nseg, int err) { bus_addr_t *addr; if (err) return; addr = (bus_addr_t *)arg; *addr = ARMC_TO_VCBUS(segs[0].ds_addr); } static void * bcm2835_mbox_init_dma(device_t dev, size_t len, bus_dma_tag_t *tag, bus_dmamap_t *map, bus_addr_t *phys) { void *buf; int err; err = bus_dma_tag_create(bus_get_dma_tag(dev), 16, 0, bcm283x_dmabus_peripheral_lowaddr(), BUS_SPACE_MAXADDR, NULL, NULL, len, 1, len, 0, NULL, NULL, tag); if (err != 0) { device_printf(dev, "can't create DMA tag\n"); return (NULL); } err = bus_dmamem_alloc(*tag, &buf, 0, map); if (err != 0) { bus_dma_tag_destroy(*tag); device_printf(dev, "can't allocate dmamem\n"); return (NULL); } err = bus_dmamap_load(*tag, *map, buf, len, bcm2835_mbox_dma_cb, phys, 0); if (err != 0) { bus_dmamem_free(*tag, buf, *map); bus_dma_tag_destroy(*tag); device_printf(dev, "can't load DMA map\n"); return (NULL); } return (buf); } static int bcm2835_mbox_err(device_t dev, bus_addr_t msg_phys, uint32_t resp_phys, struct bcm2835_mbox_hdr *msg, size_t len) { int idx; struct bcm2835_mbox_tag_hdr *tag; uint8_t *last; if ((uint32_t)msg_phys != resp_phys) { device_printf(dev, "response channel mismatch\n"); return (EIO); } if (msg->code != BCM2835_MBOX_CODE_RESP_SUCCESS) { device_printf(dev, "mbox response error\n"); return (EIO); } /* Loop until the end tag. */ tag = (struct bcm2835_mbox_tag_hdr *)(msg + 1); last = (uint8_t *)msg + len; for (idx = 0; tag->tag != 0; idx++) { if ((tag->val_len & BCM2835_MBOX_TAG_VAL_LEN_RESPONSE) == 0) { device_printf(dev, "tag %d response error\n", idx); return (EIO); } /* Clear the response bit. */ tag->val_len &= ~BCM2835_MBOX_TAG_VAL_LEN_RESPONSE; /* Next tag. */ tag = (struct bcm2835_mbox_tag_hdr *)((uint8_t *)tag + sizeof(*tag) + tag->val_buf_size); if ((uint8_t *)tag > last) { device_printf(dev, "mbox buffer size error\n"); return (EIO); } } return (0); } int bcm2835_mbox_property(void *msg, size_t msg_size) { struct bcm_mbox_softc *sc; struct msg_set_power_state *buf; bus_dma_tag_t msg_tag; bus_dmamap_t msg_map; bus_addr_t msg_phys; uint32_t reg; device_t mbox; int err; /* get mbox device */ mbox = devclass_get_device(devclass_find("mbox"), 0); if (mbox == NULL) return (ENXIO); sc = device_get_softc(mbox); sx_xlock(&sc->property_chan_lock); /* Allocate memory for the message */ buf = bcm2835_mbox_init_dma(mbox, msg_size, &msg_tag, &msg_map, &msg_phys); if (buf == NULL) { err = ENOMEM; goto out; } memcpy(buf, msg, msg_size); bus_dmamap_sync(msg_tag, msg_map, BUS_DMASYNC_PREWRITE); MBOX_WRITE(mbox, BCM2835_MBOX_CHAN_PROP, (uint32_t)msg_phys); MBOX_READ(mbox, BCM2835_MBOX_CHAN_PROP, ®); bus_dmamap_sync(msg_tag, msg_map, BUS_DMASYNC_PREREAD); memcpy(msg, buf, msg_size); err = bcm2835_mbox_err(mbox, msg_phys, reg, (struct bcm2835_mbox_hdr *)msg, msg_size); bus_dmamap_unload(msg_tag, msg_map); bus_dmamem_free(msg_tag, buf, msg_map); bus_dma_tag_destroy(msg_tag); out: sx_xunlock(&sc->property_chan_lock); return (err); } int bcm2835_mbox_set_power_state(uint32_t device_id, boolean_t on) { struct msg_set_power_state msg; int err; memset(&msg, 0, sizeof(msg)); msg.hdr.buf_size = sizeof(msg); msg.hdr.code = BCM2835_MBOX_CODE_REQ; msg.tag_hdr.tag = BCM2835_MBOX_TAG_SET_POWER_STATE; msg.tag_hdr.val_buf_size = sizeof(msg.body); msg.tag_hdr.val_len = sizeof(msg.body.req); msg.body.req.device_id = device_id; msg.body.req.state = (on ? BCM2835_MBOX_POWER_ON : 0) | BCM2835_MBOX_POWER_WAIT; msg.end_tag = 0; err = bcm2835_mbox_property(&msg, sizeof(msg)); return (err); } int bcm2835_mbox_get_clock_rate(uint32_t clock_id, uint32_t *hz) { struct msg_get_clock_rate msg; int err; memset(&msg, 0, sizeof(msg)); msg.hdr.buf_size = sizeof(msg); msg.hdr.code = BCM2835_MBOX_CODE_REQ; msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_CLOCK_RATE; msg.tag_hdr.val_buf_size = sizeof(msg.body); msg.tag_hdr.val_len = sizeof(msg.body.req); msg.body.req.clock_id = clock_id; msg.end_tag = 0; err = bcm2835_mbox_property(&msg, sizeof(msg)); *hz = msg.body.resp.rate_hz; return (err); } int bcm2835_mbox_fb_get_w_h(struct bcm2835_fb_config *fb) { int err; struct msg_fb_get_w_h msg; memset(&msg, 0, sizeof(msg)); msg.hdr.buf_size = sizeof(msg); msg.hdr.code = BCM2835_MBOX_CODE_REQ; BCM2835_MBOX_INIT_TAG(&msg.physical_w_h, GET_PHYSICAL_W_H); msg.physical_w_h.tag_hdr.val_len = 0; msg.end_tag = 0; err = bcm2835_mbox_property(&msg, sizeof(msg)); if (err == 0) { fb->xres = msg.physical_w_h.body.resp.width; fb->yres = msg.physical_w_h.body.resp.height; } return (err); } int +bcm2835_mbox_fb_get_bpp(struct bcm2835_fb_config *fb) +{ + int err; + struct msg_fb_get_bpp msg; + + memset(&msg, 0, sizeof(msg)); + msg.hdr.buf_size = sizeof(msg); + msg.hdr.code = BCM2835_MBOX_CODE_REQ; + BCM2835_MBOX_INIT_TAG(&msg.bpp, GET_DEPTH); + msg.bpp.tag_hdr.val_len = 0; + msg.end_tag = 0; + + err = bcm2835_mbox_property(&msg, sizeof(msg)); + if (err == 0) + fb->bpp = msg.bpp.body.resp.bpp; + + return (err); +} + +int bcm2835_mbox_fb_init(struct bcm2835_fb_config *fb) { int err; struct msg_fb_setup msg; memset(&msg, 0, sizeof(msg)); msg.hdr.buf_size = sizeof(msg); msg.hdr.code = BCM2835_MBOX_CODE_REQ; BCM2835_MBOX_INIT_TAG(&msg.physical_w_h, SET_PHYSICAL_W_H); msg.physical_w_h.body.req.width = fb->xres; msg.physical_w_h.body.req.height = fb->yres; BCM2835_MBOX_INIT_TAG(&msg.virtual_w_h, SET_VIRTUAL_W_H); msg.virtual_w_h.body.req.width = fb->vxres; msg.virtual_w_h.body.req.height = fb->vyres; BCM2835_MBOX_INIT_TAG(&msg.offset, SET_VIRTUAL_OFFSET); msg.offset.body.req.x = fb->xoffset; msg.offset.body.req.y = fb->yoffset; BCM2835_MBOX_INIT_TAG(&msg.depth, SET_DEPTH); msg.depth.body.req.bpp = fb->bpp; BCM2835_MBOX_INIT_TAG(&msg.alpha, SET_ALPHA_MODE); msg.alpha.body.req.alpha = BCM2835_MBOX_ALPHA_MODE_IGNORED; BCM2835_MBOX_INIT_TAG(&msg.buffer, ALLOCATE_BUFFER); msg.buffer.body.req.alignment = PAGE_SIZE; BCM2835_MBOX_INIT_TAG(&msg.pitch, GET_PITCH); msg.end_tag = 0; err = bcm2835_mbox_property(&msg, sizeof(msg)); if (err == 0) { fb->xres = msg.physical_w_h.body.resp.width; fb->yres = msg.physical_w_h.body.resp.height; fb->vxres = msg.virtual_w_h.body.resp.width; fb->vyres = msg.virtual_w_h.body.resp.height; fb->xoffset = msg.offset.body.resp.x; fb->yoffset = msg.offset.body.resp.y; fb->pitch = msg.pitch.body.resp.pitch; fb->base = VCBUS_TO_ARMC(msg.buffer.body.resp.fb_address); fb->size = msg.buffer.body.resp.fb_size; } return (err); } Index: stable/12/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h =================================================================== --- stable/12/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h (revision 361898) +++ stable/12/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h (revision 361899) @@ -1,494 +1,502 @@ /*- * Copyright (C) 2013-2014 Daisuke Aoyama * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. * * $FreeBSD$ */ #ifndef _BCM2835_MBOX_PROP_H_ #define _BCM2835_MBOX_PROP_H_ #include #include /* * Mailbox property interface: * https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface */ #define BCM2835_MBOX_CODE_REQ 0 #define BCM2835_MBOX_CODE_RESP_SUCCESS 0x80000000 #define BCM2835_MBOX_CODE_RESP_ERROR 0x80000001 #define BCM2835_MBOX_TAG_VAL_LEN_RESPONSE 0x80000000 struct bcm2835_mbox_hdr { uint32_t buf_size; uint32_t code; }; struct bcm2835_mbox_tag_hdr { uint32_t tag; uint32_t val_buf_size; uint32_t val_len; }; #define BCM2835_MBOX_INIT_TAG(tag_, tagid_) do { \ (tag_)->tag_hdr.tag = BCM2835_MBOX_TAG_##tagid_; \ (tag_)->tag_hdr.val_buf_size = sizeof((tag_)->body); \ (tag_)->tag_hdr.val_len = sizeof((tag_)->body.req); \ } while (0) #define BCM2835_MBOX_POWER_ID_EMMC 0x00000000 #define BCM2835_MBOX_POWER_ID_UART0 0x00000001 #define BCM2835_MBOX_POWER_ID_UART1 0x00000002 #define BCM2835_MBOX_POWER_ID_USB_HCD 0x00000003 #define BCM2835_MBOX_POWER_ID_I2C0 0x00000004 #define BCM2835_MBOX_POWER_ID_I2C1 0x00000005 #define BCM2835_MBOX_POWER_ID_I2C2 0x00000006 #define BCM2835_MBOX_POWER_ID_SPI 0x00000007 #define BCM2835_MBOX_POWER_ID_CCP2TX 0x00000008 #define BCM2835_MBOX_POWER_ON (1 << 0) #define BCM2835_MBOX_POWER_WAIT (1 << 1) #define BCM2835_MBOX_TAG_GET_POWER_STATE 0x00020001 #define BCM2835_MBOX_TAG_SET_POWER_STATE 0x00028001 struct msg_get_power_state { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t device_id; } req; struct { uint32_t device_id; uint32_t state; } resp; } body; uint32_t end_tag; }; struct msg_set_power_state { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t device_id; uint32_t state; } req; struct { uint32_t device_id; uint32_t state; } resp; } body; uint32_t end_tag; }; /* Sets the power state for a given device */ int bcm2835_mbox_set_power_state(uint32_t, boolean_t); #define BCM2835_MBOX_CLOCK_ID_EMMC 0x00000001 #define BCM2835_MBOX_CLOCK_ID_UART 0x00000002 #define BCM2835_MBOX_CLOCK_ID_ARM 0x00000003 #define BCM2835_MBOX_CLOCK_ID_CORE 0x00000004 #define BCM2835_MBOX_CLOCK_ID_V3D 0x00000005 #define BCM2835_MBOX_CLOCK_ID_H264 0x00000006 #define BCM2835_MBOX_CLOCK_ID_ISP 0x00000007 #define BCM2835_MBOX_CLOCK_ID_SDRAM 0x00000008 #define BCM2835_MBOX_CLOCK_ID_PIXEL 0x00000009 #define BCM2835_MBOX_CLOCK_ID_PWM 0x0000000a #define BCM2838_MBOX_CLOCK_ID_EMMC2 0x0000000c #define BCM2835_MBOX_TAG_GET_CLOCK_RATE 0x00030002 #define BCM2835_MBOX_TAG_SET_CLOCK_RATE 0x00038002 #define BCM2835_MBOX_TAG_GET_MAX_CLOCK_RATE 0x00030004 #define BCM2835_MBOX_TAG_GET_MIN_CLOCK_RATE 0x00030007 struct msg_get_clock_rate { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t clock_id; } req; struct { uint32_t clock_id; uint32_t rate_hz; } resp; } body; uint32_t end_tag; }; struct msg_set_clock_rate { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t clock_id; uint32_t rate_hz; } req; struct { uint32_t clock_id; uint32_t rate_hz; } resp; } body; uint32_t end_tag; }; struct msg_get_max_clock_rate { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t clock_id; } req; struct { uint32_t clock_id; uint32_t rate_hz; } resp; } body; uint32_t end_tag; }; struct msg_get_min_clock_rate { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t clock_id; } req; struct { uint32_t clock_id; uint32_t rate_hz; } resp; } body; uint32_t end_tag; }; int bcm2835_mbox_get_clock_rate(uint32_t, uint32_t *); #define BCM2835_MBOX_TURBO_ON 1 #define BCM2835_MBOX_TURBO_OFF 0 #define BCM2835_MBOX_TAG_GET_TURBO 0x00030009 #define BCM2835_MBOX_TAG_SET_TURBO 0x00038009 struct msg_get_turbo { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t id; } req; struct { uint32_t id; uint32_t level; } resp; } body; uint32_t end_tag; }; struct msg_set_turbo { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t id; uint32_t level; } req; struct { uint32_t id; uint32_t level; } resp; } body; uint32_t end_tag; }; #define BCM2835_MBOX_VOLTAGE_ID_CORE 0x00000001 #define BCM2835_MBOX_VOLTAGE_ID_SDRAM_C 0x00000002 #define BCM2835_MBOX_VOLTAGE_ID_SDRAM_P 0x00000003 #define BCM2835_MBOX_VOLTAGE_ID_SDRAM_I 0x00000004 #define BCM2835_MBOX_TAG_GET_VOLTAGE 0x00030003 #define BCM2835_MBOX_TAG_SET_VOLTAGE 0x00038003 #define BCM2835_MBOX_TAG_GET_MAX_VOLTAGE 0x00030005 #define BCM2835_MBOX_TAG_GET_MIN_VOLTAGE 0x00030008 struct msg_get_voltage { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t voltage_id; } req; struct { uint32_t voltage_id; uint32_t value; } resp; } body; uint32_t end_tag; }; struct msg_set_voltage { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t voltage_id; uint32_t value; } req; struct { uint32_t voltage_id; uint32_t value; } resp; } body; uint32_t end_tag; }; struct msg_get_max_voltage { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t voltage_id; } req; struct { uint32_t voltage_id; uint32_t value; } resp; } body; uint32_t end_tag; }; struct msg_get_min_voltage { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t voltage_id; } req; struct { uint32_t voltage_id; uint32_t value; } resp; } body; uint32_t end_tag; }; #define BCM2835_MBOX_TAG_GET_TEMPERATURE 0x00030006 #define BCM2835_MBOX_TAG_GET_MAX_TEMPERATURE 0x0003000a struct msg_get_temperature { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t temperature_id; } req; struct { uint32_t temperature_id; uint32_t value; } resp; } body; uint32_t end_tag; }; struct msg_get_max_temperature { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t temperature_id; } req; struct { uint32_t temperature_id; uint32_t value; } resp; } body; uint32_t end_tag; }; #define BCM2835_MBOX_TAG_GET_PHYSICAL_W_H 0x00040003 #define BCM2835_MBOX_TAG_SET_PHYSICAL_W_H 0x00048003 #define BCM2835_MBOX_TAG_GET_VIRTUAL_W_H 0x00040004 #define BCM2835_MBOX_TAG_SET_VIRTUAL_W_H 0x00048004 struct bcm2835_mbox_tag_fb_w_h { struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t width; uint32_t height; } req; struct { uint32_t width; uint32_t height; } resp; } body; }; #define BCM2835_MBOX_TAG_GET_DEPTH 0x00040005 #define BCM2835_MBOX_TAG_SET_DEPTH 0x00048005 struct bcm2835_mbox_tag_depth { struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t bpp; } req; struct { uint32_t bpp; } resp; } body; }; #define BCM2835_MBOX_TAG_GET_ALPHA_MODE 0x00040007 #define BCM2835_MBOX_TAG_SET_ALPHA_MODE 0x00048007 #define BCM2835_MBOX_ALPHA_MODE_0_OPAQUE 0 #define BCM2835_MBOX_ALPHA_MODE_0_TRANSPARENT 1 #define BCM2835_MBOX_ALPHA_MODE_IGNORED 2 struct bcm2835_mbox_tag_alpha_mode { struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t alpha; } req; struct { uint32_t alpha; } resp; } body; }; #define BCM2835_MBOX_TAG_GET_VIRTUAL_OFFSET 0x00040009 #define BCM2835_MBOX_TAG_SET_VIRTUAL_OFFSET 0x00048009 struct bcm2835_mbox_tag_virtual_offset { struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t x; uint32_t y; } req; struct { uint32_t x; uint32_t y; } resp; } body; }; #define BCM2835_MBOX_TAG_GET_PITCH 0x00040008 struct bcm2835_mbox_tag_pitch { struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { } req; struct { uint32_t pitch; } resp; } body; }; #define BCM2835_MBOX_TAG_ALLOCATE_BUFFER 0x00040001 struct bcm2835_mbox_tag_allocate_buffer { struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { uint32_t alignment; } req; struct { uint32_t fb_address; uint32_t fb_size; } resp; } body; }; #define BCM2835_MBOX_TAG_RELEASE_BUFFER 0x00048001 struct bcm2835_mbox_tag_release_buffer { struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { } req; struct { } resp; } body; }; #define BCM2835_MBOX_TAG_GET_TOUCHBUF 0x0004000f struct bcm2835_mbox_tag_touchbuf { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_hdr tag_hdr; union { struct { } req; struct { uint32_t address; } resp; } body; uint32_t end_tag; }; struct bcm2835_fb_config { uint32_t xres; uint32_t yres; uint32_t vxres; uint32_t vyres; uint32_t xoffset; uint32_t yoffset; uint32_t bpp; uint32_t pitch; uint32_t base; uint32_t size; }; struct msg_fb_get_w_h { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_fb_w_h physical_w_h; uint32_t end_tag; }; int bcm2835_mbox_fb_get_w_h(struct bcm2835_fb_config *); +struct msg_fb_get_bpp { + struct bcm2835_mbox_hdr hdr; + struct bcm2835_mbox_tag_depth bpp; + uint32_t end_tag; +}; + +int bcm2835_mbox_fb_get_bpp(struct bcm2835_fb_config *); + struct msg_fb_setup { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_fb_w_h physical_w_h; struct bcm2835_mbox_tag_fb_w_h virtual_w_h; struct bcm2835_mbox_tag_virtual_offset offset; struct bcm2835_mbox_tag_depth depth; struct bcm2835_mbox_tag_alpha_mode alpha; struct bcm2835_mbox_tag_allocate_buffer buffer; struct bcm2835_mbox_tag_pitch pitch; uint32_t end_tag; }; int bcm2835_mbox_fb_init(struct bcm2835_fb_config *); int bcm2835_mbox_property(void *, size_t); #endif /* _BCM2835_MBOX_PROP_H_ */ Index: stable/12 =================================================================== --- stable/12 (revision 361898) +++ stable/12 (revision 361899) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r352028