Changes in / [a977e37:37d0dd4] in mainline

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) (3 diffs)

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

@@ -174 +174 @@
 {
 #ifdef CONFIG_FB
+        uint32_t width, height;
         fb_properties_t prop;
-        if (bcm2835_fb_init(&prop)) {
+
+        if (!bcm2835_mbox_get_fb_size(&width, &height)) {
+                printf("mbox: could not get the framebuffer size\n");
+                width = 640;
+                height = 480;
+        }
+        if (bcm2835_fb_init(&prop, width, height)) {
                 outdev_t *fb_dev = fb_init(&prop);
                 if (fb_dev)

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

@@ -68 +68 @@
 
 enum {
+        MBOX_TAG_GET_PHYS_W_H   = 0x00040003,
+        MBOX_TAG_SET_PHYS_W_H   = 0x00048003,
+        MBOX_TAG_GET_VIRT_W_H   = 0x00040004,
+        MBOX_TAG_SET_VIRT_W_G   = 0x00048004
+};
+
+enum {
         MBOX_PROP_CODE_REQ      = 0x00000000,
         MBOX_PROP_CODE_RESP_OK  = 0x80000000,
@@ -122 +129 @@
 
 typedef struct {
+        mbox_prop_buf_hdr_t     buf_hdr;
+        mbox_tag_hdr_t          tag_hdr;
+        struct {
+                uint32_t        width;
+                uint32_t        height;
+        } body;
+        uint32_t zero;
+} mbox_getfbsize_buf_t;
+
+typedef struct {
         ioport32_t width;
         ioport32_t height;
@@ -135 +152 @@
 
 extern bool bcm2835_prop_get_memory(uint32_t *base, uint32_t *size);
-extern bool bcm2835_fb_init(fb_properties_t *prop);
+extern bool bcm2835_fb_init(fb_properties_t *prop, uint32_t width, uint32_t heigth);
+extern bool bcm2835_mbox_get_fb_size(uint32_t *h, uint32_t *w);
 
 #endif

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

@@ -86 +86 @@
 }
 
-bool bcm2835_fb_init(fb_properties_t *prop)
+bool bcm2835_fb_init(fb_properties_t *prop, uint32_t width, uint32_t height)
 {
         bcm2835_mbox_t *fb_mbox;
@@ -95 +95 @@
             KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
 
-        fb_desc->width = 640;
-        fb_desc->height = 480;
+        fb_desc->width = width;
+        fb_desc->height = height;
         fb_desc->virt_width = fb_desc->width;
         fb_desc->virt_height = fb_desc->height;
@@ -128 +128 @@
 }
 
+bool bcm2835_mbox_get_fb_size(uint32_t *w, uint32_t *h)
+{
+        bool r;
+        MBOX_BUFF_ALLOC(msg, mbox_getfbsize_buf_t);
+        bcm2835_mbox_t *mbox;
+
+        mbox = (void *) km_map(BCM2835_MBOX0_ADDR, sizeof(bcm2835_mbox_t),
+            KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
+        assert(mbox);
+
+        msg->buf_hdr.size = sizeof(mbox_getfbsize_buf_t);
+        msg->buf_hdr.code = MBOX_PROP_CODE_REQ;
+        msg->tag_hdr.tag_id = MBOX_TAG_GET_PHYS_W_H;
+        msg->tag_hdr.buf_size = sizeof(msg->body);
+        msg->tag_hdr.val_len  = 0;
+        msg->zero = 0;
+
+        mbox_write(mbox,
+            MBOX_CHAN_PROP_A2V, KA2VCA((uint32_t)msg));
+        mbox_read(mbox, MBOX_CHAN_PROP_A2V);
+
+        r = msg->buf_hdr.code == MBOX_PROP_CODE_RESP_OK;
+        if (r) {
+                *h = msg->body.height;
+                *w = msg->body.width;
+        }
+
+        km_unmap((uintptr_t) mbox, sizeof(bcm2835_mbox_t));
+        return r;
+}
+
 /**
  * @}