Changeset 73abf49 in mainline for kernel/genarch/src/drivers/bcm2835/mbox.c

Timestamp:

2021-06-22T19:36:32Z (3 years ago)

Author:

Maurizio Lombardi <mlombard@…>

Branches:

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

Children:

1b7b7af

Parents:

034ce6bb

git-author:

Maurizio Lombardi <mlombard@…> (2021-06-22 19:21:17)

git-committer:

Maurizio Lombardi <mlombard@…> (2021-06-22 19:36:32)

Message:

raspberrypi: mbox: read the framebuffer size from VideoCore

Get the real framebuffer size, do not assume
it's 640x480

Signed-off-by: Maurizio Lombardi <mlombard@…>

File:

• kernel/genarch/src/drivers/bcm2835/mbox.c (modified) (3 diffs)

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);
+
+        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((bcm2835_mbox_t *)BCM2835_MBOX0_ADDR,
+            MBOX_CHAN_PROP_A2V, KA2VCA((uint32_t)msg));
+        mbox_read((bcm2835_mbox_t *)BCM2835_MBOX0_ADDR,
+            MBOX_CHAN_PROP_A2V);
+
+        r = msg->buf_hdr.code == MBOX_PROP_CODE_RESP_OK;
+        if (r) {
+                *h = msg->body.height;
+                *w = msg->body.width;
+        }
+
+        return r;
+}
+
 /**
  * @}