Changeset f22f679 in mainline

Timestamp:

2013-04-04T21:01:11Z (11 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

44186b01

Parents:

409a996

Message:

Raspberry Pi: add framebuffer initialization

Location:

kernel

Files:

• arch/arm32/src/mach/raspberrypi/raspberrypi.c (modified) (1 diff)
• genarch/include/genarch/drivers/bcm2835/mbox.h (modified) (3 diffs)
• genarch/src/drivers/bcm2835/mbox.c (modified) (5 diffs)

kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c

@@ -173 +173 @@
 static void raspberrypi_output_init(void)
 {
+#ifdef CONFIG_FB
+        fb_properties_t prop;
+        if (bcm2835_fb_init(&prop)) {
+                outdev_t *fb_dev = fb_init(&prop);
+                if (fb_dev)
+                        stdout_wire(fb_dev);
+        }
+#endif
+
 #ifdef CONFIG_PL011_UART
         if (pl011_uart_init(&raspi.uart, BCM2835_UART_IRQ,

kernel/genarch/include/genarch/drivers/bcm2835/mbox.h

@@ -37 +37 @@
 #define _BCM2835_MBOX_H_
 
+#include <genarch/fb/fb.h>
 #include <arch/mm/page.h>
 #include <align.h>
@@ -79 +80 @@
 #define MBOX_MSG_VALUE(msg)     ((msg) & ~0xf)
 
-#define KA2VC(addr)             (KA2PA(addr) + 0x40000000)
+#define KA2VCA(addr)            (KA2PA(addr) + 0x40000000)
 
 #define MBOX_ADDR_ALIGN         16
@@ -120 +121 @@
 } mbox_getmem_buf_t;
 
+typedef struct {
+        ioport32_t width;
+        ioport32_t height;
+        ioport32_t virt_width;
+        ioport32_t virt_height;
+        ioport32_t pitch;
+        ioport32_t bpp;
+        ioport32_t x_offset;
+        ioport32_t y_offset;
+        ioport32_t addr;
+        ioport32_t size;
+} bcm2835_fb_desc_t;
+
 bool bcm2835_prop_get_memory(uint32_t *base, uint32_t *size);
+bool bcm2835_fb_init(fb_properties_t *prop);
 
 #endif

kernel/genarch/src/drivers/bcm2835/mbox.c

@@ -34 +34 @@
  */
 
+#include <mm/km.h>
+#include <mm/slab.h>
 #include <typedefs.h>
 #include <genarch/drivers/bcm2835/mbox.h>
@@ -39 +41 @@
 static void mbox_write(bcm2835_mbox_t *mbox, uint8_t chan, uint32_t value)
 {
-        if (!mbox)
-                mbox = (bcm2835_mbox_t *)BCM2835_MBOX0_ADDR;
-
         while (mbox->status & MBOX_STATUS_FULL) ;
         mbox->write = MBOX_COMPOSE(chan, value);
@@ -49 +48 @@
 {
         uint32_t msg;
-
-        if (!mbox)
-                mbox = (bcm2835_mbox_t *)BCM2835_MBOX0_ADDR;
 
         do {
@@ -73 +69 @@
         req->zero = 0;
 
-        mbox_write(NULL, MBOX_CHAN_PROP_A2V, KA2VC((uint32_t)req));
-        mbox_read(NULL, MBOX_CHAN_PROP_A2V);
+        mbox_write((bcm2835_mbox_t *)BCM2835_MBOX0_ADDR,
+                   MBOX_CHAN_PROP_A2V, KA2VCA((uint32_t)req));
+        mbox_read((bcm2835_mbox_t *)BCM2835_MBOX0_ADDR,
+                  MBOX_CHAN_PROP_A2V);
 
         if (req->buf_hdr.code == MBOX_PROP_CODE_RESP_OK) {
@@ -87 +85 @@
 }
 
+bool bcm2835_fb_init(fb_properties_t *prop)
+{
+        bcm2835_mbox_t *fb_mbox;
+        bcm2835_fb_desc_t *fb_desc;
+        void *fb_desc_buf;
+        bool ret = false;
+
+        fb_desc_buf = malloc(sizeof(bcm2835_fb_desc_t) + MBOX_ADDR_ALIGN, 0);
+        if (!fb_desc_buf)
+                return false;
+
+        fb_mbox = (void *) km_map(BCM2835_MBOX0_ADDR, sizeof(bcm2835_mbox_t),
+                                  PAGE_NOT_CACHEABLE);
+        fb_desc = (bcm2835_fb_desc_t *) ALIGN_UP((uintptr_t)fb_desc_buf,
+                                                 MBOX_ADDR_ALIGN);
+
+        fb_desc->width = 640;
+        fb_desc->height = 480;
+        fb_desc->virt_width = fb_desc->width;
+        fb_desc->virt_height = fb_desc->height;
+        fb_desc->pitch = 0;                     /* Set by VC */
+        fb_desc->bpp = 16;
+        fb_desc->x_offset = 0;
+        fb_desc->y_offset = 0;
+        fb_desc->addr = 0;                      /* Set by VC */
+        fb_desc->size = 0;                      /* Set by VC */
+
+        mbox_write(fb_mbox, MBOX_CHAN_FB, KA2VCA(fb_desc));
+
+        if (mbox_read(fb_mbox, MBOX_CHAN_FB)) {
+                printf("BCM2835 framebuffer initialization failed\n");
+                goto out;
+        }
+
+        prop->addr = fb_desc->addr;
+        prop->offset = 0;
+        prop->x = fb_desc->width;
+        prop->y = fb_desc->height;
+        prop->scan = fb_desc->pitch;
+        prop->visual = VISUAL_RGB_5_6_5_LE;
+
+        printf("BCM2835 framebuffer at 0x%08x (%dx%d)\n", prop->addr,
+               prop->x, prop->y);
+        ret = true;
+out:
+        km_unmap((uintptr_t)fb_mbox, sizeof(bcm2835_mbox_t));
+        free(fb_desc_buf);
+        return ret;
+}
+
 /**
  * @}