metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Use phys2bus for channels other than Property channel

This commit is contained in:
Berkus Decker 2019-03-10 15:14:42 +02:00
parent 925fedd351
commit 70ec2ab852
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/platform/mailbox.rs
View File

@ -210,7 +210,7 @@ pub mod alpha_mode {
fn write(regs: &RegisterBlock, buf_ptr: u32, channel: u32) -> Result<()> { fn write(regs: &RegisterBlock, buf_ptr: u32, channel: u32) -> Result<()> {
let mut count: u32 = 0; let mut count: u32 = 0;
// let buf_ptr = BcmHost::phys2bus(buf_ptr); // let buf_ptr = BcmHost::phys2bus(buf_ptr); not used for PropertyTags channel
println!("Mailbox::write {:x}/{:x}", buf_ptr, channel); println!("Mailbox::write {:x}/{:x}", buf_ptr, channel);
@ -322,11 +322,7 @@ impl Mailbox {
} }
pub fn read(&self, channel: u32) -> Result<()> { pub fn read(&self, channel: u32) -> Result<()> {
read( read(self, self.buffer.as_ptr() as u32, channel)?;
self,
/*BcmHost::phys2bus*/ (self.buffer.as_ptr() as u32),
channel,
)?;
match self.buffer[1] { match self.buffer[1] {
response::SUCCESS => { response::SUCCESS => {
@ -463,8 +459,16 @@ impl GpuFb {
MAILBOX_BASE as *const _ MAILBOX_BASE as *const _
} }
// https://github.com/raspberrypi/firmware/wiki/Accessing-mailboxes says:
// **With the exception of the property tags mailbox channel,**
// when passing memory addresses as the data part of a mailbox message,
// the addresses should be **bus addresses as seen from the VC.**
pub fn write(&self) -> Result<()> { pub fn write(&self) -> Result<()> {
write(self, &self.width as *const u32 as u32, channel::FrameBuffer) write(
self,
BcmHost::phys2bus(&self.width as *const u32 as u32),
channel::FrameBuffer,
)
} }
pub fn read(&mut self) -> Result<()> { pub fn read(&mut self) -> Result<()> {