Update FramebufferInfo

Author: equation314

kernel/src/arch/aarch64/board/raspi3/mailbox.rs

@@ -2,7 +2,6 @@
 //!
 //! (ref: https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface)
 
-use super::fb::FramebufferInfo;
 use crate::memory::virt_to_phys;
 use aarch64::asm;
 use alloc::string::String;
@@ -175,6 +174,35 @@ struct PropertyMailboxRequest<T: Sized> {
 #[derive(Debug)]
 struct Align16<T: Sized>(PropertyMailboxRequest<T>);
 
+/// Some information of raspberry pi framebuffer
+#[repr(C)]
+#[derive(Debug, Clone, Copy)]
+pub struct RaspiFramebufferInfo {
+    /// visible width
+    pub xres: u32,
+    /// visible height
+    pub yres: u32,
+    /// virtual width
+    pub xres_virtual: u32,
+    /// virtual height
+    pub yres_virtual: u32,
+    /// virtual offset x
+    pub xoffset: u32,
+    /// virtual offset y
+    pub yoffset: u32,
+
+    /// bits per pixel
+    pub depth: u32,
+    /// bytes per line
+    pub pitch: u32,
+
+    /// bus address, starts from 0xC0000000/0x40000000
+    /// (see https://github.com/raspberrypi/firmware/wiki/Accessing-mailboxes)
+    pub bus_addr: u32,
+    /// screen buffer size
+    pub screen_size: u32,
+}
+
 /// Pack a sequence of concatenated tags into a request, and send the address
 /// to the mailbox.
 /// Returns `PropertyMailboxResult<typeof($tags)>`.
@@ -285,12 +313,12 @@ pub fn framebuffer_set_virtual_offset(
 }
 
 /// Allocate framebuffer on GPU and try to set width/height/depth.
-/// Returns `FramebufferInfo`.
+/// Returns `RaspiFramebufferInfo`.
 pub fn framebuffer_alloc(
     width: u32,
     height: u32,
     depth: u32,
-) -> PropertyMailboxResult<FramebufferInfo> {
+) -> PropertyMailboxResult<RaspiFramebufferInfo> {
     #[repr(C, packed)]
     #[derive(Debug)]
     struct FramebufferAllocTag {
@@ -348,7 +376,7 @@ pub fn framebuffer_alloc(
     };
 
     let ret = send_request!(tags)?;
-    Ok(FramebufferInfo {
+    Ok(RaspiFramebufferInfo {
         xres: ret.set_physical_size.buf[0],
         yres: ret.set_physical_size.buf[1],
         xres_virtual: ret.set_virtual_size.buf[0],

kernel/src/arch/aarch64/board/raspi3/mod.rs

@@ -10,7 +10,7 @@ pub mod mailbox;
 pub mod serial;
 pub mod timer;
 
-use fb::{ColorConfig, FramebufferResult};
+use fb::{ColorDepth, ColorFormat, FramebufferInfo, FramebufferResult};
 
 /// Initialize serial port before other initializations.
 pub fn init_serial_early() {
@@ -75,10 +75,23 @@ pub fn probe_fb_info(width: u32, height: u32, depth: u32) -> FramebufferResult {
         ))?;
     }
 
-    let color_config = match info.depth {
-        16 => ColorConfig::RGB565,
-        32 => ColorConfig::BGRA8888,
+    let depth = ColorDepth::try_from(info.depth)?;
+    let format = match info.depth {
+        16 => ColorFormat::RGB565,
+        32 => ColorFormat::BGRA8888,
         _ => Err(format!("unsupported color depth {}", info.depth))?,
     };
-    Ok((info, color_config, vaddr))
+    Ok(FramebufferInfo {
+        xres: info.xres,
+        yres: info.yres,
+        xres_virtual: info.xres_virtual,
+        yres_virtual: info.yres_virtual,
+        xoffset: info.xoffset,
+        yoffset: info.yoffset,
+        depth: depth,
+        format: format,
+        paddr: paddr as usize,
+        vaddr: vaddr,
+        screen_size: info.screen_size as usize,
+    })
 }

kernel/src/arch/mipsel/board/malta/mod.rs

@@ -37,17 +37,17 @@ pub fn init_driver() {
 }
 
 pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> fb::FramebufferResult {
-    let fb_info = FramebufferInfo {
+    Ok(FramebufferInfo {
         xres: 800,
         yres: 600,
         xres_virtual: 800,
         yres_virtual: 600,
         xoffset: 0,
         yoffset: 0,
-        depth: 8,
-        pitch: 800,
-        bus_addr: 0xb0000000,
+        depth: fb::ColorDepth::try_from(8)?,
+        format: fb::ColorFormat::VgaPalette,
+        paddr: 0xb0000000,
+        vaddr: 0xb0000000,
         screen_size: 800 * 600,
-    };
-    Ok((fb_info, fb::ColorConfig::VgaPalette, 0xb0000000))
+    })
 }

kernel/src/arch/mipsel/board/thinpad/mod.rs

@@ -28,17 +28,17 @@ pub fn init_driver() {
 }
 
 pub fn probe_fb_info(width: u32, height: u32, depth: u32) -> FramebufferResult {
-    let fb_info = FramebufferInfo {
+    Ok(FramebufferInfo {
         xres: 800,
         yres: 600,
         xres_virtual: 800,
         yres_virtual: 600,
         xoffset: 0,
         yoffset: 0,
-        depth: 8,
-        pitch: 800,
-        bus_addr: 0xa2000000,
+        depth: fb::ColorDepth::try_from(8)?,
+        format: fb::ColorFormat::RGB332,
+        paddr: 0xa2000000,
+        vaddr: 0xa2000000,
         screen_size: 800 * 600,
-    };
-    Ok((fb_info, fb::ColorConfig::RGB332, 0xa2000000))
+    })
 }

kernel/src/arch/x86_64/board/mod.rs

@@ -5,7 +5,7 @@ use crate::consts::KERNEL_OFFSET;
 use crate::memory::phys_to_virt;
 use bootloader::bootinfo::{BootInfo, VbeModeInfo};
 use core::mem::zeroed;
-use fb::{ColorConfig, FramebufferInfo, FramebufferResult, FRAME_BUFFER};
+use fb::{ColorFormat, ColorDepth, FramebufferInfo, FramebufferResult, FRAME_BUFFER};
 
 static mut VBE_MODE: VbeModeInfo = VbeModeInfo {
     attributes: 0,
@@ -54,25 +54,25 @@ pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> FramebufferResul
     let pitch = unsafe { VBE_MODE.pitch as u32 };
     let framebuffer = unsafe { VBE_MODE.framebuffer as usize };
     let depth = unsafe { VBE_MODE.bpp as u32 };
-    let fb_info = FramebufferInfo {
+    let format = if depth == 8 {
+        fb::ColorFormat::RGB332
+    } else if depth == 16 {
+        fb::ColorFormat::RGB565
+    } else {
+        // assume BGRA8888 for now
+        fb::ColorFormat::RGBA8888
+    };
+    Ok(FramebufferInfo {
         xres: width,
         yres: height,
         xres_virtual: width,
         yres_virtual: height,
         xoffset: 0,
         yoffset: 0,
-        depth: depth,
-        pitch: pitch, // TOKNOW
-        bus_addr: framebuffer as u32,
-        screen_size: width * height * (depth / 8),
-    };
-    let config = if depth == 8 {
-        fb::ColorConfig::RGB332
-    } else if depth == 16 {
-        fb::ColorConfig::RGB565
-    } else {
-        // assume BGRA8888 for now
-        fb::ColorConfig::RGBA8888
-    };
-    Ok((fb_info, config, phys_to_virt(framebuffer)))
+        depth: ColorDepth::try_from(depth)?,
+        format: format,
+        paddr: framebuffer,
+        vaddr: phys_to_virt(framebuffer),
+        screen_size: (width * height * (depth / 8)) as usize,
+    })
 }