vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'driver_graphics_improvements' into 'master'

Browse Source 
Various changes to driver-graphics

See merge request redox-os/drivers!272
This commit is contained in:
Jeremy Soller
2025-07-01 15:58:14 -06:00
parent 10cd204e60 8ac07539b0
commit 181f0ea4ec
5 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+14 -3
View File
@@ -404,7 +404,7 @@ dependencies = [
"inputd",
"libredox",
"log",
"redox-scheme 0.4.0",
"redox-scheme 0.6.2",
"redox_syscall",
]
@@ -1153,6 +1153,16 @@ dependencies = [
"redox_syscall",
]
[[package]]
name = "redox-scheme"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c00025a04f76fdcf72c15f10c7a12d9f2fdde93e539be9a57d5d632c4158a9e"
dependencies = [
"libredox",
"redox_syscall",
]
[[package]]
name = "redox_event"
version = "0.4.1"
@@ -1165,8 +1175,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.5.11"
source = "git+https://gitlab.redox-os.org/redox-os/syscall.git?branch=master#8f646a63ac9c3aa532a37ddfdc136ec19878f0d6"
version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
dependencies = [
"bitflags 2.9.0",
]
Cargo.toml
-1
View File
@@ -56,4 +56,3 @@ lto = "fat"
mio = { git = "https://gitlab.redox-os.org/redox-os/mio.git", branch = "redox-unix" }
orbclient = { git = "https://gitlab.redox-os.org/redox-os/orbclient.git", version = "0.3.44" }
redox-daemon = { git = "https://gitlab.redox-os.org/redox-os/redox-daemon.git" }
redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git", branch = "master" }
graphics/driver-graphics/Cargo.toml
+1 -1
View File
@@ -5,7 +5,7 @@ edition = "2021"
[dependencies]
log = "0.4"
redox-scheme = "0.4"
redox-scheme = "0.6.2"
redox_syscall = "0.5"
libredox = "0.1.3"
graphics/driver-graphics/src/lib.rs
+28 -14
View File
@@ -5,7 +5,9 @@ use std::sync::Arc;
use graphics_ipc::v1::{CursorDamage, Damage};
use inputd::{VtEvent, VtEventKind};
use libredox::Fd;
use redox_scheme::{RequestKind, Scheme, SignalBehavior, Socket};
use redox_scheme::scheme::SchemeSync;
use redox_scheme::{CallerCtx, OpenResult, RequestKind, SignalBehavior, Socket};
use syscall::schemev2::NewFdFlags;
use syscall::{Error, MapFlags, Result, EAGAIN, EBADF, EINVAL};
pub trait GraphicsAdapter {
@@ -136,7 +138,7 @@ impl<T: GraphicsAdapter> GraphicsScheme<T> {
match request.kind() {
RequestKind::Call(call) => {
let response = call.handle_scheme(self);
let response = call.handle_sync(self);
self.socket
.write_response(response, SignalBehavior::Restart)
.expect("driver-graphics: failed to write response");
@@ -192,8 +194,8 @@ impl<T: GraphicsAdapter> GraphicsScheme<T> {
}
}
impl<T: GraphicsAdapter> Scheme for GraphicsScheme<T> {
fn open(&mut self, path: &str, _flags: usize, _uid: u32, _gid: u32) -> Result<usize> {
impl<T: GraphicsAdapter> SchemeSync for GraphicsScheme<T> {
fn open(&mut self, path: &str, _flags: usize, _ctx: &CallerCtx) -> Result<OpenResult> {
if path.is_empty() {
return Err(Error::new(EINVAL));
}
@@ -214,10 +216,13 @@ impl<T: GraphicsAdapter> Scheme for GraphicsScheme<T> {
self.next_id += 1;
self.handles
.insert(self.next_id, Handle::V1Screen { vt, screen: id });
Ok(self.next_id)
Ok(OpenResult::ThisScheme {
number: self.next_id,
flags: NewFdFlags::empty(),
})
}
fn fpath(&mut self, id: usize, buf: &mut [u8]) -> syscall::Result<usize> {
fn fpath(&mut self, id: usize, buf: &mut [u8], _ctx: &CallerCtx) -> syscall::Result<usize> {
let path = match self.handles.get(&id).ok_or(Error::new(EBADF))? {
Handle::V1Screen { vt, screen } => {
let framebuffer = &self.vts[vt].display_fbs[*screen];
@@ -233,20 +238,20 @@ impl<T: GraphicsAdapter> Scheme for GraphicsScheme<T> {
Ok(path.len())
}
fn fsync(&mut self, id: usize) -> syscall::Result<usize> {
fn fsync(&mut self, id: usize, _ctx: &CallerCtx) -> syscall::Result<()> {
match self.handles.get(&id).ok_or(Error::new(EBADF))? {
Handle::V1Screen { vt, screen } => {
if *vt != self.active_vt {
// This is a protection against background VT's spamming us with flush requests. We will
// flush the framebuffer on the next VT switch anyway
return Ok(0);
return Ok(());
}
Self::update_whole_screen(
&mut self.adapter,
*screen,
&self.vts[vt].display_fbs[*screen],
);
Ok(0)
Ok(())
}
}
}
@@ -257,6 +262,7 @@ impl<T: GraphicsAdapter> Scheme for GraphicsScheme<T> {
buf: &mut [u8],
_offset: u64,
_fcntl_flags: u32,
_ctx: &CallerCtx,
) -> Result<usize> {
match self.handles.get(&id).ok_or(Error::new(EBADF))? {
Handle::V1Screen { .. } => {
@@ -273,7 +279,14 @@ impl<T: GraphicsAdapter> Scheme for GraphicsScheme<T> {
}
}
fn write(&mut self, id: usize, buf: &[u8], _offset: u64, _fcntl_flags: u32) -> Result<usize> {
fn write(
&mut self,
id: usize,
buf: &[u8],
_offset: u64,
_fcntl_flags: u32,
_ctx: &CallerCtx,
) -> Result<usize> {
match self.handles.get(&id).ok_or(Error::new(EBADF))? {
Handle::V1Screen { vt, screen } => {
if *vt != self.active_vt {
@@ -347,16 +360,17 @@ impl<T: GraphicsAdapter> Scheme for GraphicsScheme<T> {
fn mmap_prep(
&mut self,
id: usize,
_offset: u64,
offset: u64,
_size: usize,
_flags: MapFlags,
_ctx: &CallerCtx,
) -> syscall::Result<usize> {
// log::trace!("KSMSG MMAP {} {:?} {} {}", id, _flags, _offset, _size);
let framebuffer = match self.handles.get(&id).ok_or(Error::new(EINVAL))? {
Handle::V1Screen { vt, screen } => &self.vts[vt].display_fbs[*screen],
let (framebuffer, offset) = match self.handles.get(&id).ok_or(Error::new(EINVAL))? {
Handle::V1Screen { vt, screen } => (&self.vts[vt].display_fbs[*screen], offset),
};
let ptr = T::map_dumb_framebuffer(&mut self.adapter, framebuffer);
Ok(ptr as usize)
Ok(unsafe { ptr.add(offset as usize) } as usize)
}
}
virtio-core/src/transport.rs
+1 -1
View File
@@ -59,7 +59,7 @@ pub fn spawn_irq_thread(irq_handle: &File, queue: &Arc<Queue<'static>>) {
let queue_copy = queue.clone();
std::thread::spawn(move || {
let mut event_queue = RawEventQueue::new().unwrap();
let event_queue = RawEventQueue::new().unwrap();
event_queue
.subscribe(irq_fd as usize, 0, event::EventFlags::READ)