Changeset ee685630 in mainline

Timestamp:

2012-04-11T17:43:37Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0747468

Parents:

179f6f2

Message:

Add framebuffer support for bbmx (amdm37x/omap37).

Files:

• HelenOS.config (modified) (2 diffs)
• defaults/arm32/beagleboardxm/Makefile.config (modified) (1 diff)
• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (5 diffs)
• kernel/genarch/include/drivers/amdm37x_dispc/amdm37x_dispc.h (added)

HelenOS.config

@@ -537 +537 @@
 @ "1920x1080"
 @ "1920x1200"
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_MODE (choice)
+! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_MODE (choice)
 
 % Default framebuffer depth
@@ -543 +543 @@
 @ "16"
 @ "24"
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
+! [(PLATFORM=ia32|PLATFORM=amd64|MACHINE=beagleboardxm)&CONFIG_HID_OUT!=none&CONFIG_FB=y] CONFIG_BFB_BPP (choice)
 
 % Start AP processors by the loader

defaults/arm32/beagleboardxm/Makefile.config

@@ -6 +6 @@
 
 #framebuffer
-CONFIG_FB = n
+CONFIG_FB = y
+
+CONFIG_BFB_MODE = 1024x768
+CONFIG_BFB_BPP = 24

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

@@ -38 +38 @@
 #include <genarch/drivers/amdm37x_uart/amdm37x_uart.h>
 #include <genarch/drivers/amdm37x_gpt/amdm37x_gpt.h>
+#include <genarch/drivers/amdm37x_dispc/amdm37x_dispc.h>
+#include <genarch/fb/fb.h>
 #include <genarch/srln/srln.h>
 #include <interrupt.h>
@@ -59 +61 @@
 
 static struct beagleboard {
+        amdm37x_dispc_regs_t *dispc;
         amdm37x_irc_regs_t *irc_addr;
         amdm37x_uart_t uart;
@@ -82 +85 @@
 }
 
+static void bbxm_setup_fb(unsigned width, unsigned height, unsigned bpp)
+{
+        const unsigned pixel_bytes = (bpp / 8);
+        const size_t size = ALIGN_UP(width * height * pixel_bytes, FRAME_SIZE);
+        const unsigned frames = size / FRAME_SIZE;
+        unsigned order = 0;
+        unsigned frame = 1;
+        while (frame < frames) {
+                frame *= 2;
+                ++order;
+        }
+        printf("Allocating %d (2^%d) frames.\n", size, order);
+        /* prefer highmem as we don't care about virtual mapping. */
+        void *buffer = frame_alloc(order, FRAME_LOWMEM);
+        ASSERT(buffer);
+
+        amdm37x_dispc_setup_fb(beagleboard.dispc, width, height, bpp,
+            (uintptr_t) buffer);
+
+        fb_properties_t prop = {
+                .addr = (uintptr_t)buffer,
+                .offset = 0,
+                .x = width,
+                .y = height,
+                .scan = width * pixel_bytes,
+                .visual = VISUAL_RGB_5_6_5_LE
+        };
+        switch (bpp)
+        {
+        case 8:
+                prop.visual = VISUAL_INDIRECT_8; break;
+        case 16:
+                prop.visual = VISUAL_RGB_5_6_5_LE; break;
+        case 24:
+                prop.visual = VISUAL_RGB_8_8_8; break;
+        case 32:
+                prop.visual = VISUAL_RGB_8_8_8_0; break;
+        default:
+                printf("Invalid framebuffer bit depth: bailing out.\n");
+                return;
+        }
+        outdev_t *fb_dev = fb_init(&prop);
+        if (fb_dev)
+                stdout_wire(fb_dev);
+
+}
+
 static void bb_timer_irq_handler(irq_t *irq)
 {
@@ -100 +150 @@
             (void *) km_map(AMDM37x_IRC_BASE_ADDRESS, AMDM37x_IRC_SIZE,
             PAGE_NOT_CACHEABLE);
+        ASSERT(beagleboard.irc_addr);
         amdm37x_irc_init(beagleboard.irc_addr);
 
+        /* Map display controller */
+        beagleboard.dispc = (void*) km_map(AMDM37x_DISPC_BASE_ADDRESS,
+            AMDM37x_DISPC_SIZE, PAGE_NOT_CACHEABLE);
+        ASSERT(beagleboard.dispc);
 
         /* Initialize timer, pick timer1, because it is in always-power domain
@@ -167 +222 @@
 {
 #ifdef CONFIG_FB
-#error "Frame buffer is not yet supported!"
+        bbxm_setup_fb(CONFIG_BFB_WIDTH, CONFIG_BFB_HEIGHT, CONFIG_BFB_BPP);
+#else
+        (void)bbxm_setup_fb;
 #endif
         /* UART3 is wired to external RS232 connector */