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

drivers/graphics: Move DrmConnector and DrmEncoder to a separate module

Browse Source
This commit is contained in:
bjorn3
2026-03-13 21:57:44 +01:00
parent 37264a9e96
commit c088e48948
6 changed files with 124 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/graphics/driver-graphics/src/connector.rs
+115
View File
@@ -0,0 +1,115 @@
use std::fmt::Debug;
use drm_sys::{
drm_mode_modeinfo, DRM_MODE_CONNECTOR_Unknown, DRM_MODE_OBJECT_CONNECTOR,
DRM_MODE_OBJECT_ENCODER,
};
use syscall::Result;
use crate::objects::{DrmObject, DrmObjectId, DrmObjects};
use crate::GraphicsAdapter;
impl<T: GraphicsAdapter> DrmObjects<T> {
pub fn add_connector(&mut self, driver_data: T::Connector) -> DrmObjectId {
let encoder_id = self.add(DrmEncoder {
crtc_id: DrmObjectId::INVALID,
possible_crtcs: 0,
possible_clones: 1 << self.encoders.len(),
});
self.encoders.push(encoder_id);
let connector_id = self.add(DrmConnector {
encoder_id,
modes: vec![],
connector_type: DRM_MODE_CONNECTOR_Unknown,
connector_type_id: self.connectors.len() as u32, // FIXME maybe pick unique id within connector type?
connection: DrmConnectorStatus::Unknown,
mm_width: 0,
mm_height: 0,
subpixel: DrmSubpixelOrder::Unknown,
driver_data,
});
self.connectors.push(connector_id);
connector_id
}
pub fn connector_ids(&self) -> &[DrmObjectId] {
&self.connectors
}
pub fn connectors(&self) -> impl Iterator<Item = &DrmConnector<T::Connector>> + use<'_, T> {
self.connectors.iter().map(|&id| self.get(id).unwrap())
}
pub fn get_connector(&self, id: DrmObjectId) -> Result<&DrmConnector<T::Connector>> {
self.get(id)
}
pub fn get_connector_mut(
&mut self,
id: DrmObjectId,
) -> Result<&mut DrmConnector<T::Connector>> {
self.get_mut(id)
}
pub fn encoder_ids(&self) -> &[DrmObjectId] {
&self.encoders
}
pub fn get_encoder(&self, id: DrmObjectId) -> Result<&DrmEncoder> {
self.get(id)
}
}
#[derive(Debug)]
pub struct DrmConnector<T: Debug + 'static> {
pub encoder_id: DrmObjectId,
pub modes: Vec<drm_mode_modeinfo>,
pub connector_type: u32,
pub connector_type_id: u32,
pub connection: DrmConnectorStatus,
pub mm_width: u32,
pub mm_height: u32,
pub subpixel: DrmSubpixelOrder,
pub driver_data: T,
}
#[derive(Debug, Copy, Clone)]
#[repr(u32)]
pub enum DrmConnectorStatus {
Disconnected = 0,
Connected = 1,
Unknown = 2,
}
#[derive(Debug, Copy, Clone)]
#[repr(u32)]
pub enum DrmSubpixelOrder {
Unknown = 0,
HorizontalRGB,
HorizontalBGR,
VerticalRGB,
VerticalBGR,
None,
}
impl<T: Debug + 'static> DrmObject for DrmConnector<T> {
fn object_type(&self) -> u32 {
DRM_MODE_OBJECT_CONNECTOR
}
}
// FIXME can we represent connector and encoder using a single struct?
#[derive(Debug)]
pub struct DrmEncoder {
pub crtc_id: DrmObjectId,
pub possible_crtcs: u32,
pub possible_clones: u32,
}
impl DrmObject for DrmEncoder {
fn object_type(&self) -> u32 {
DRM_MODE_OBJECT_ENCODER
}
}
drivers/graphics/driver-graphics/src/lib.rs
+1
View File
@@ -27,6 +27,7 @@ use syscall::{Error, MapFlags, Result, EACCES, EAGAIN, EBADF, EINVAL, ENOENT, EO
use crate::objects::{DrmObjectId, DrmObjects};
use crate::properties::DrmPropertyKind;
pub mod connector;
pub mod objects;
pub mod properties;
drivers/graphics/driver-graphics/src/objects.rs
+2 -113
View File
@@ -3,10 +3,6 @@ use std::collections::HashMap;
use std::fmt::Debug;
use std::marker::PhantomData;
use drm_sys::{
drm_mode_modeinfo, DRM_MODE_CONNECTOR_Unknown, DRM_MODE_OBJECT_CONNECTOR,
DRM_MODE_OBJECT_ENCODER,
};
use syscall::{Error, Result, EINVAL};
use crate::GraphicsAdapter;
@@ -14,8 +10,8 @@ use crate::GraphicsAdapter;
#[derive(Debug)]
pub struct DrmObjects<T: GraphicsAdapter> {
next_id: DrmObjectId,
connectors: Vec<DrmObjectId>,
encoders: Vec<DrmObjectId>,
pub(crate) connectors: Vec<DrmObjectId>,
pub(crate) encoders: Vec<DrmObjectId>,
pub(crate) objects: HashMap<DrmObjectId, DrmObjectData>,
_marker: PhantomData<T>,
}
@@ -67,61 +63,6 @@ impl<T: GraphicsAdapter> DrmObjects<T> {
let object = self.objects.get(&id).ok_or(Error::new(EINVAL))?;
Ok(object.kind.object_type())
}
pub fn add_connector(&mut self, driver_data: T::Connector) -> DrmObjectId {
let encoder_id = self.add(DrmEncoder {
crtc_id: DrmObjectId::INVALID,
possible_crtcs: 0,
possible_clones: 1 << self.encoders.len(),
});
self.encoders.push(encoder_id);
let connector_id = self.add(DrmConnector {
encoder_id,
modes: vec![],
connector_type: DRM_MODE_CONNECTOR_Unknown,
connector_type_id: self.connectors.len() as u32, // FIXME maybe pick unique id within connector type?
connection: DrmConnectorStatus::Unknown,
mm_width: 0,
mm_height: 0,
subpixel: DrmSubpixelOrder::Unknown,
driver_data,
});
self.connectors.push(connector_id);
connector_id
}
pub fn connector_ids(&self) -> &[DrmObjectId] {
&self.connectors
}
pub fn connectors(&self) -> impl Iterator<Item = &DrmConnector<T::Connector>> + use<'_, T> {
self.connectors.iter().map(|&id| {
(&self.objects[&id].kind as &dyn Any)
.downcast_ref::<DrmConnector<T::Connector>>()
.unwrap()
})
}
pub fn get_connector(&self, id: DrmObjectId) -> Result<&DrmConnector<T::Connector>> {
self.get(id)
}
pub fn get_connector_mut(
&mut self,
id: DrmObjectId,
) -> Result<&mut DrmConnector<T::Connector>> {
self.get_mut(id)
}
pub fn encoder_ids(&self) -> &[DrmObjectId] {
&self.encoders
}
pub fn get_encoder(&self, id: DrmObjectId) -> Result<&DrmEncoder> {
self.get(id)
}
}
#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
@@ -146,55 +87,3 @@ pub(crate) struct DrmObjectData {
pub trait DrmObject: Any + Debug {
fn object_type(&self) -> u32;
}
#[derive(Debug)]
pub struct DrmConnector<T: Debug + 'static> {
pub encoder_id: DrmObjectId,
pub modes: Vec<drm_mode_modeinfo>,
pub connector_type: u32,
pub connector_type_id: u32,
pub connection: DrmConnectorStatus,
pub mm_width: u32,
pub mm_height: u32,
pub subpixel: DrmSubpixelOrder,
pub driver_data: T,
}
#[derive(Debug, Copy, Clone)]
#[repr(u32)]
pub enum DrmConnectorStatus {
Disconnected = 0,
Connected = 1,
Unknown = 2,
}
#[derive(Debug, Copy, Clone)]
#[repr(u32)]
pub enum DrmSubpixelOrder {
Unknown = 0,
HorizontalRGB,
HorizontalBGR,
VerticalRGB,
VerticalBGR,
None,
}
impl<T: Debug + 'static> DrmObject for DrmConnector<T> {
fn object_type(&self) -> u32 {
DRM_MODE_OBJECT_CONNECTOR
}
}
// FIXME can we represent connector and encoder using a single struct?
#[derive(Debug)]
pub struct DrmEncoder {
pub crtc_id: DrmObjectId,
pub possible_crtcs: u32,
pub possible_clones: u32,
}
impl DrmObject for DrmEncoder {
fn object_type(&self) -> u32 {
DRM_MODE_OBJECT_ENCODER
}
}
drivers/graphics/ihdgd/src/device/scheme.rs
+2 -1
View File
@@ -4,7 +4,8 @@ use std::alloc::{self, Layout};
use std::convert::TryInto;
use std::ptr::{self, NonNull};
use driver_graphics::objects::{DrmConnectorStatus, DrmObjectId, DrmObjects};
use driver_graphics::connector::DrmConnectorStatus;
use driver_graphics::objects::{DrmObjectId, DrmObjects};
use driver_graphics::{
modeinfo_for_size, Buffer, CursorPlane, GraphicsAdapter, StandardProperties,
};
drivers/graphics/vesad/src/scheme.rs
+2 -1
View File
@@ -2,7 +2,8 @@ use std::alloc::{self, Layout};
use std::convert::TryInto;
use std::ptr::{self, NonNull};
use driver_graphics::objects::{DrmConnectorStatus, DrmObjectId, DrmObjects};
use driver_graphics::connector::DrmConnectorStatus;
use driver_graphics::objects::{DrmObjectId, DrmObjects};
use driver_graphics::{
modeinfo_for_size, Buffer, CursorPlane, GraphicsAdapter, StandardProperties,
};
drivers/graphics/virtio-gpud/src/scheme.rs
+2 -1
View File
@@ -2,7 +2,8 @@ use std::fmt;
use std::sync::Arc;
use common::{dma::Dma, sgl};
use driver_graphics::objects::{DrmConnectorStatus, DrmObjectId, DrmObjects};
use driver_graphics::connector::DrmConnectorStatus;
use driver_graphics::objects::{DrmObjectId, DrmObjects};
use driver_graphics::{
modeinfo_for_size, Buffer as DrmBuffer, CursorPlane, GraphicsAdapter, GraphicsScheme,
StandardProperties,