Changeset a14f346 in mainline

Timestamp:

2013-01-21T00:14:50Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c9d0642d

Parents:

c7d11a0b

Message:

amdm37x_dispc: Replace kenrel driver with uspace one.

Works on qemu.

Files:

• boot/arch/arm32/Makefile.inc (modified) (1 diff)
• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (5 diffs)
• kernel/genarch/include/drivers/amdm37x_dispc/amdm37x_dispc.h (deleted)
• uspace/Makefile (modified) (1 diff)
• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (1 diff)
• uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (1 diff)

boot/arch/arm32/Makefile.inc

@@ -59 +59 @@
 RD_DRVS += \
         infrastructure/rootamdm37x \
+        fb/amdm37x_dispc \
         bus/usb/ehci \
         bus/usb/ohci \

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>
@@ -61 +60 @@
 
 static struct beagleboard {
-        amdm37x_dispc_regs_t *dispc;
         amdm37x_irc_regs_t *irc_addr;
         amdm37x_uart_t uart;
@@ -85 +83 @@
 }
 
-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;
-        }
-        /* prefer highmem as we don't care about virtual mapping. */
-        void *buffer = frame_alloc(order, FRAME_LOWMEM);
-        if (!buffer) {
-                printf("Failed to allocate framebuffer.\n");
-                return;
-        }
-
-        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_BGR_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)
 {
@@ -154 +103 @@
         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. Use timer1, because it is in WKUP power domain
@@ -223 +167 @@
 static void bbxm_output_init(void)
 {
-#ifdef CONFIG_FB
-        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 */
         const bool ok = amdm37x_uart_init(&beagleboard.uart,

uspace/Makefile

@@ -194 +194 @@
 ifeq ($(UARCH),arm32)
         DIRS += \
-                drv/infrastructure/rootamdm37x
+                drv/infrastructure/rootamdm37x \
+                drv/fb/amdm37x_dispc
 endif
 

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -316 +316 @@
         }
 
-        ddf_log_note("Handling damage\n");
-        return EOK;
-}
-
+        return EOK;
+}

uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c

@@ -195 +195 @@
                 ddf_msg(LVL_ERROR, "Failed to add EHCI function for "
                     "BeagleBoard-xM platform.");
+        if (rootamdm37x_add_fun(dev, "dispc", "amdm37x&dispc", &ehci) != EOK)
+                ddf_msg(LVL_ERROR, "Failed to add dispc function for "
+                    "BeagleBoard-xM platform.");
 
         return EOK;