Changeset 8a9a41e in mainline for kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c (modified) (1 diff)

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)