diff --git a/services/graphics-server/src/api.rs b/services/graphics-server/src/api.rs index 0167fd0bb..b83abe479 100644 --- a/services/graphics-server/src/api.rs +++ b/services/graphics-server/src/api.rs @@ -108,6 +108,11 @@ pub(crate) enum Opcode { BulkReadFonts, RestartBulkRead, + /// sling the framebuffer into and out of the suspend/resume area, abusing this + /// to help accelerate redraws between modal swaps. + Stash, + Pop, + /// generates a test pattern TestPattern, diff --git a/services/graphics-server/src/backend/betrusted.rs b/services/graphics-server/src/backend/betrusted.rs index 2b8c22613..0382bdcf2 100644 --- a/services/graphics-server/src/backend/betrusted.rs +++ b/services/graphics-server/src/backend/betrusted.rs @@ -1,6 +1,6 @@ use crate::api::Point; use crate::api::{LINES, WIDTH}; -use susres::{ManagedMem, RegManager, RegOrField, SuspendResume}; +use susres::{RegManager, RegOrField, SuspendResume}; use utralib::generated::*; use xous::MemoryRange; @@ -13,7 +13,7 @@ const CONFIG_CLOCK_FREQUENCY: u32 = 100_000_000; pub struct XousDisplay { fb: MemoryRange, hwfb: MemoryRange, - srfb: ManagedMem<{ utralib::generated::HW_MEMLCD_MEM_LEN / core::mem::size_of::() }>, + srfb: [u32; FB_SIZE], csr: utralib::CSR, susres: RegManager<{ utra::memlcd::MEMLCD_NUMREGS }>, } @@ -61,7 +61,7 @@ impl XousDisplay { hwfb, csr: CSR::new(control.as_mut_ptr() as *mut u32), susres: RegManager::new(control.as_mut_ptr() as *mut u32), - srfb: ManagedMem::new(fb), + srfb: [0u32; FB_SIZE], }; display.set_clock(CONFIG_CLOCK_FREQUENCY); @@ -101,18 +101,36 @@ impl XousDisplay { ) } + pub fn stash(&mut self) { + let fb = unsafe{core::slice::from_raw_parts_mut(self.fb.as_mut_ptr() as *mut u32, FB_SIZE)}; + for lines in 0..FB_LINES { + // set the dirty bits prior to stashing the frame buffer + fb[lines * FB_WIDTH_WORDS + (FB_WIDTH_WORDS - 1)] |= 0x1_0000; + } + let srfb_ptr = self.srfb.as_mut_ptr() as *mut u32; + for (index, &src) in fb.iter().enumerate() { + unsafe{srfb_ptr.add(index).write_volatile(src)}; + } + } + pub fn pop(&mut self) { + let fb: &mut [u32] = self.fb.as_slice_mut(); + fb[..FB_SIZE].copy_from_slice(&self.srfb); + self.redraw(); + } + pub fn suspend(&mut self) { while self.busy() { // just wait until any pending FB operations are done } - let fb: *mut [u32; FB_SIZE] = self.fb.as_mut_ptr() as *mut [u32; FB_SIZE]; + let fb = unsafe{core::slice::from_raw_parts_mut(self.fb.as_mut_ptr() as *mut u32, FB_SIZE)}; for lines in 0..FB_LINES { // set the dirty bits prior to stashing the frame buffer - unsafe { - (*fb)[lines * FB_WIDTH_WORDS + (FB_WIDTH_WORDS - 1)] |= 0x1_0000; - } + fb[lines * FB_WIDTH_WORDS + (FB_WIDTH_WORDS - 1)] |= 0x1_0000; + } + let srfb_ptr = self.srfb.as_mut_ptr() as *mut u32; + for (index, &src) in fb.iter().enumerate() { + unsafe{srfb_ptr.add(index).write_volatile(src)}; } - self.srfb.suspend(); self.susres.suspend(); let note = crate::sleep_note::LOGO_MAP; @@ -154,7 +172,8 @@ impl XousDisplay { } pub fn resume(&mut self) { self.susres.resume(); - self.srfb.resume(); + let fb: &mut [u32] = self.fb.as_slice_mut(); + fb[..FB_SIZE].copy_from_slice(&self.srfb); self.redraw(); } diff --git a/services/graphics-server/src/backend/minifb.rs b/services/graphics-server/src/backend/minifb.rs index 56f045b71..3b90d37b5 100644 --- a/services/graphics-server/src/backend/minifb.rs +++ b/services/graphics-server/src/backend/minifb.rs @@ -20,6 +20,7 @@ const LIGHT_COLOUR: u32 = 0x1B1B19; pub struct XousDisplay { native_buffer: Vec, //[u32; WIDTH * HEIGHT], emulated_buffer: [u32; FB_SIZE], + srfb: [u32; FB_SIZE], window: Window, devboot: bool, } @@ -70,6 +71,7 @@ impl XousDisplay { native_buffer, window, emulated_buffer: [0u32; FB_SIZE], + srfb: [0u32; FB_SIZE], devboot: true, } } @@ -82,6 +84,15 @@ impl XousDisplay { pub fn suspend(&self) {} pub fn resume(&self) {} + pub fn stash(&mut self) { + self.srfb.copy_from_slice(&self.emulated_buffer); + } + pub fn pop(&mut self) { + self.emulated_buffer.copy_from_slice(&self.srfb); + self.redraw(); + self.update(); + } + pub fn screen_size(&self) -> Point { Point::new(WIDTH as i16, HEIGHT as i16) } diff --git a/services/graphics-server/src/lib.rs b/services/graphics-server/src/lib.rs index 825950ca5..f895b230c 100644 --- a/services/graphics-server/src/lib.rs +++ b/services/graphics-server/src/lib.rs @@ -268,6 +268,38 @@ impl Gfx { ) .expect("couldn't self test"); } + + pub fn stash(&self, blocking: bool) { + if blocking { + send_message( + self.conn, + Message::new_blocking_scalar(Opcode::Stash.to_usize().unwrap(), 0, 0, 0, 0) + ) + .expect("couldn't stash"); + } else { + send_message( + self.conn, + Message::new_scalar(Opcode::Stash.to_usize().unwrap(), 0, 0, 0, 0) + ) + .expect("couldn't stash"); + } + } + + pub fn pop(&self, blocking: bool) { + if blocking { + send_message( + self.conn, + Message::new_blocking_scalar(Opcode::Pop.to_usize().unwrap(), 0, 0, 0, 0) + ) + .expect("couldn't stash"); + } else { + send_message( + self.conn, + Message::new_scalar(Opcode::Pop.to_usize().unwrap(), 0, 0, 0, 0) + ) + .expect("couldn't stash"); + } + } } use core::sync::atomic::{AtomicU32, Ordering}; diff --git a/services/graphics-server/src/main.rs b/services/graphics-server/src/main.rs index db0b6cfd0..9b35f4e17 100644 --- a/services/graphics-server/src/main.rs +++ b/services/graphics-server/src/main.rs @@ -606,6 +606,20 @@ fn wrapped_main() -> ! { xous::return_scalar(msg.sender, duration).expect("couldn't ack test pattern"); }), + Some(Opcode::Stash) => { + display.stash(); + match msg.body { // ack the message if it's a blocking scalar + xous::Message::BlockingScalar(_) => xous::return_scalar(msg.sender, 1).unwrap(), + _ => () + } + } + Some(Opcode::Pop) => { + display.pop(); + match msg.body { // ack the message if it's a blocking scalar + xous::Message::BlockingScalar(_) => xous::return_scalar(msg.sender, 1).unwrap(), + _ => () + } + } Some(Opcode::Quit) => break, None => { log::error!("received opcode scalar that is not handled");