Ticket #6105: 0001-Initial-OpenFirmware-frame-buffer-support.patch

headers/private/kernel/boot/platform/openfirmware/platform_arch.h

@@ -16 +16 @@
 
 /* memory management */
     
+// For use with arch_mmu_map_physical_memory()
+static const uint32 kDefaultPageMode = 0x3; // present, R/W
+
 extern status_t arch_set_callback(void);
 extern void *arch_mmu_allocate(void *address, size_t size, uint8 protection,
     bool exactAddress);
 extern status_t arch_mmu_free(void *address, size_t size);
 extern status_t arch_mmu_init(void);
+extern addr_t arch_mmu_map_physical_memory(addr_t physicalAddress, size_t size, uint32 mode);
 
 /* CPU */
 

src/system/boot/platform/generic/video_blit.cpp

@@ -6 +6 @@
  */
 
 
-#include "video.h"
-
 #include <arch/cpu.h>
 #include <boot/stage2.h>
 #include <boot/platform.h>
-#include <boot/menu.h>
 #include <boot/platform/generic/video.h>
 #include <boot/kernel_args.h>
 

src/system/boot/platform/generic/video_rle.cpp

@@ -6 +6 @@
  */
 
 
-#include "video.h"
-
 #include <arch/cpu.h>
 #include <boot/stage2.h>
 #include <boot/platform.h>

src/system/boot/platform/generic/video_splash.cpp

@@ -6 +6 @@
  */
 
 
-#include "video.h"
-#include "mmu.h"
-
 #include <arch/cpu.h>
 #include <boot/stage2.h>
 #include <boot/platform.h>

src/system/boot/platform/openfirmware/Jamfile

@@ -2 +2 @@
 
 SubDirC++Flags -D_BOOT_MODE -fno-rtti ;
 
+local genericPlatformSources =
+    text_menu.cpp
+    video_blit.cpp
+    video_splash.cpp
+    video_rle.cpp
+;
+
 KernelMergeObject boot_platform_openfirmware.o :
     console.cpp
     debug.c
@@ -19 +26 @@
     openfirmware.cpp
     openfirmware_devices.cpp
 
-    # generic
-    text_menu.cpp
+    $(genericPlatformSources)
     :
     : boot_platform_openfirmware_$(TARGET_ARCH).a
 ;
 
-SEARCH on [ FGristFiles text_menu.cpp ]
+SEARCH on [ FGristFiles $(genericPlatformSources) ]
     = [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
 SEARCH on [ FGristFiles openfirmware.cpp openfirmware_devices.cpp ]
     = [ FDirName $(HAIKU_TOP) src system kernel platform openfirmware ] ;

src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp

@@ -608 +608 @@
 }
 
 
+// TODO: This is a hack identity-mapping the physical memory
+// since we don't seem to have the concept of next virtual addresses/pages in ppc (yet?)
+extern "C" addr_t
+arch_mmu_map_physical_memory(addr_t physicalAddress, size_t size, uint32 mode)
+{
+    addr_t address = physicalAddress/*sNextVirtualAddress*/;
+    addr_t pageOffset = physicalAddress & (B_PAGE_SIZE - 1);
+
+    physicalAddress -= pageOffset;
+    size += pageOffset;
+
+    for (addr_t offset = 0; offset < size; offset += B_PAGE_SIZE) {
+        map_page((void*)(physicalAddress + offset)/*get_next_virtual_page()*/, (void*)(physicalAddress + offset), mode);
+    }
+
+    return address /*+ pageOffset*/;
+}
+
+
 extern "C" void *
 arch_mmu_allocate(void *_virtualAddress, size_t size, uint8 _protection,
     bool exactAddress)

src/system/boot/platform/openfirmware/console.cpp

@@ -8 +8 @@
 #include <string.h>
 #include <platform/openfirmware/openfirmware.h>
 #include <util/kernel_cpp.h>
+#include <boot/stage2.h>
 
 #include "Handle.h"
 #include "console.h"
@@ -69 +70 @@
 {
     const char *string = (const char *)buffer;
 
+    if (gKernelArgs.frame_buffer.enabled)
+        return bufferSize;
+
     // be nice to our audience and replace single "\n" with "\r\n"
 
     while (bufferSize > 0) {

src/system/boot/platform/openfirmware/video.cpp

@@ -1 +1 @@
 /*
  * Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
+ * Copyright 2010, Andreas Färber <andreas.faerber@web.de>
  * Distributed under the terms of the MIT License.
  */
 
 
+#include <platform_arch.h>
+#include <boot/stage2.h>
 #include <boot/platform.h>
+#include <boot/kernel_args.h>
+#include <boot/platform/generic/video.h>
+#include <platform/openfirmware/openfirmware.h>
+#include <arch_mmu.h>
+
+
+static int sScreen;
+static addr_t sFrameBuffer;
+
+
+void
+platform_blit4(addr_t frameBuffer, const uint8 *data,
+    uint16 width, uint16 height, uint16 imageWidth, uint16 left, uint16 top)
+{
+    if (!data)
+        return;
+    // TODO
+}
+
+
+extern "C" void
+platform_set_palette(const uint8 *palette)
+{
+    switch (gKernelArgs.frame_buffer.depth) {
+        case 8:
+            // TODO try to optimize with set-colors
+            for (int index = 0; index < 256; index++) {
+                of_call_method(sScreen, "color!", 4, 0, index,
+                    palette[index * 3 + 2],
+                    palette[index * 3 + 1],
+                    palette[index * 3 + 0]);
+            }
+            break;
+        default:
+            break;
+    }
+}
 
 
 extern "C" void
 platform_switch_to_logo(void)
 {
-    // ToDo: implement me
+    // in debug mode, we'll never show the logo
+    if ((platform_boot_options() & BOOT_OPTION_DEBUG_OUTPUT) != 0)
+        return;
+    addr_t lastBase = gKernelArgs.frame_buffer.physical_buffer.start;
+    size_t lastSize = gKernelArgs.frame_buffer.physical_buffer.size;
+
+    if (sScreen == OF_FAILED)
+        return;
+    int mode = 0x9;
+    if (of_call_method(sScreen, "set-mode", 1, 0, mode) == OF_FAILED)
+        dprintf("** mode not set!\n");
+    int depth = 32;
+    if (of_call_method(sScreen, "set-depth", 1, 0, depth) == OF_FAILED)
+        dprintf("** depth not set!\n");
+    int width, height;
+    if (of_call_method(sScreen, "dimensions", 0, 2, &height, &width) == OF_FAILED)
+        return;
+    int package = of_instance_to_package(sScreen);
+    if (package == OF_FAILED)
+        return;
+    int lineBytes;
+    if (of_getprop(package, "linebytes", &lineBytes, sizeof(int)) == OF_FAILED)
+        return;
+    if (of_getprop(package, "address", &gKernelArgs.frame_buffer.physical_buffer.start, sizeof(int)) == OF_FAILED)
+        return;
+    gKernelArgs.frame_buffer.width = width;
+    gKernelArgs.frame_buffer.height = height;
+    gKernelArgs.frame_buffer.depth = depth;
+    gKernelArgs.frame_buffer.bytes_per_row = lineBytes;
+    gKernelArgs.frame_buffer.physical_buffer.size = lineBytes * height;
+
+    dprintf("video mode: %ux%ux%u\n", gKernelArgs.frame_buffer.width,
+        gKernelArgs.frame_buffer.height, gKernelArgs.frame_buffer.depth);
+
+    gKernelArgs.frame_buffer.enabled = true;
+
+    // If the new frame buffer is either larger than the old one or located at
+    // a different address, we need to remap it, so we first have to throw
+    // away its previous mapping
+    if (lastBase != 0
+        && (lastBase != gKernelArgs.frame_buffer.physical_buffer.start
+            || lastSize < gKernelArgs.frame_buffer.physical_buffer.size)) {
+        arch_mmu_free((void *)sFrameBuffer, lastSize); // XXX not yet implemented
+        lastBase = 0;
+    }
+    if (lastBase == 0) {
+        // the graphics memory has not been mapped yet!
+        sFrameBuffer = arch_mmu_map_physical_memory(
+            gKernelArgs.frame_buffer.physical_buffer.start,
+            gKernelArgs.frame_buffer.physical_buffer.size, kDefaultPageMode);
+    }
+
+    video_display_splash(sFrameBuffer);
 }
 
 
 extern "C" void
 platform_switch_to_text_mode(void)
 {
-    // ToDo: implement me
+    if (!gKernelArgs.frame_buffer.enabled)
+        return;
+
+    gKernelArgs.frame_buffer.enabled = 0;
 }
 
 
 extern "C" status_t
 platform_init_video(void)
 {
-    // ToDo: implement me
+    gKernelArgs.frame_buffer.enabled = 0;
+
+    sScreen = of_open("screen");
+    if (sScreen == OF_FAILED)
+        return B_NO_INIT;
+
     return B_OK;
 }