i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm2835: Improve framebuffer tracing and error trapping

Browse Source
This commit is contained in:
Alexander von Gluck IV
2015-03-10 22:40:07 -05:00
parent 2fc1ec2238
commit 2ac9acbba4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/arch/arm/arch_framebuffer_bcm2835.cpp
+9 -6
View File
@@ -34,6 +34,7 @@ mmu_map_physical_memory(addr_t physicalAddress, size_t size, uint32 flags);
extern "C" bool extern "C" bool
mmu_get_virtual_mapping(addr_t virtualAddress, phys_addr_t *_physicalAddress); mmu_get_virtual_mapping(addr_t virtualAddress, phys_addr_t *_physicalAddress);
extern ArchMailbox *gMailbox; extern ArchMailbox *gMailbox;
struct framebuffer_config { struct framebuffer_config {
@@ -77,6 +78,7 @@ arch_get_fb_arm_bcm2835(addr_t base)
status_t status_t
ArchFBArmBCM2835::Init() ArchFBArmBCM2835::Init()
{ {
gKernelArgs.frame_buffer.enabled = true;
return B_OK; return B_OK;
} }
@@ -135,13 +137,11 @@ ArchFBArmBCM2835::SetVideoMode(int width, int height, int depth)
if (value != 0) { if (value != 0) {
dprintf("failed to configure framebuffer: %" B_PRIx32 "\n", value); dprintf("failed to configure framebuffer: %" B_PRIx32 "\n", value);
//debug_toggle_led(5, DEBUG_DELAY_SHORT);
return B_ERROR; return B_ERROR;
} }
if (sFramebufferConfig.frame_buffer_address == 0) { if (sFramebufferConfig.frame_buffer_address == 0) {
dprintf("didn't get the framebuffer address\n"); dprintf("didn't get the framebuffer address\n");
//debug_toggle_led(10, DEBUG_DELAY_SHORT);
return B_ERROR; return B_ERROR;
} }
@@ -162,16 +162,19 @@ ArchFBArmBCM2835::SetVideoMode(int width, int height, int depth)
= BCM283X_BUS_TO_PHYSICAL(sFramebufferConfig.frame_buffer_address); = BCM283X_BUS_TO_PHYSICAL(sFramebufferConfig.frame_buffer_address);
fSize = sFramebufferConfig.screen_size; fSize = sFramebufferConfig.screen_size;
// TODO: kDefaultPageFlags // kDefaultPageFlags?
//fBase = (addr_t)mmu_map_physical_memory(fPhysicalBase, fSize,
// kDefaultPageFlags);
fBase = (addr_t)mmu_map_physical_memory(fPhysicalBase, fSize, 0); fBase = (addr_t)mmu_map_physical_memory(fPhysicalBase, fSize, 0);
dprintf("video framebuffer: va: %p pa: %p\n", (void *)fBase,
(void *)fPhysicalBase);
fCurrentWidth = width; fCurrentWidth = width;
fCurrentHeight = height; fCurrentHeight = height;
fCurrentDepth = depth; fCurrentDepth = depth;
fCurrentBytesPerRow = sFramebufferConfig.bytes_per_row; fCurrentBytesPerRow = sFramebufferConfig.bytes_per_row;
gKernelArgs.frame_buffer.physical_buffer.start = (addr_t)fPhysicalBase;
return B_OK; return B_OK;
} }