kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

autocommit 2022-03-11 20:04:41 CET

Browse source
This commit is contained in:
Julian Orth 2022-03-11 20:04:41 +01:00
parent 0ae73ab9c4
commit eb1d500561
10 changed files with 93 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backends/metal.rs
View file

@ -164,7 +164,7 @@ async fn run_(state: Rc<State>) -> Result<(), MetalError> {
struct MetalInputDevice {
slot: usize,
id: InputDeviceId,
devnum: c::dev_t,
_devnum: c::dev_t,
fd: CloneCell<Option<Rc<OwnedFd>>>,
inputdev: Cell<Option<RegisteredDevice>>,
devnode: CString,

8
src/backends/metal/monitor.rs
View file

@ -6,12 +6,12 @@ use crate::metal::video::PendingDrmDevice;
use crate::metal::{MetalBackend, MetalDevice, MetalDrmDevice, MetalError, MetalInputDevice};
use crate::org::freedesktop::login1::session::{PauseDevice, ResumeDevice};
use crate::udev::UdevDevice;
use crate::utils::nonblock::set_nonblock;
use crate::ErrorFmt;
use bstr::ByteSlice;
use std::cell::Cell;
use std::rc::Rc;
use uapi::{c, OwnedFd};
use crate::utils::nonblock::set_nonblock;
const DRM: &[u8] = b"drm";
const INPUT: &[u8] = b"input";
@ -82,7 +82,7 @@ impl MetalBackend {
}
}
fn handle_drm_device_resume(self: &Rc<Self>, dev: &Rc<MetalDrmDevice>, fd: Rc<OwnedFd>) {
fn handle_drm_device_resume(self: &Rc<Self>, dev: &Rc<MetalDrmDevice>, _fd: Rc<OwnedFd>) {
log::info!("Device resumed: {}", dev.dev.devnode.to_bytes().as_bstr());
}
@ -224,7 +224,7 @@ impl MetalBackend {
}
}
fn handle_drm_change(self: &Rc<Self>, dev: UdevDevice) -> Option<()> {
fn handle_drm_change(self: &Rc<Self>, _dev: UdevDevice) -> Option<()> {
None
}
@ -266,7 +266,7 @@ impl MetalBackend {
let dev = Rc::new(MetalInputDevice {
slot,
id: device_id,
devnum,
_devnum: devnum,
fd: Default::default(),
inputdev: Default::default(),
devnode: devnode.to_owned(),

76
src/backends/metal/video.rs
View file

@ -1,5 +1,11 @@
use crate::async_engine::{AsyncFd, SpawnedFuture};
use crate::backend::{BackendEvent, Output, OutputId};
use crate::drm::drm::{ConnectorStatus, ConnectorType, DrmBlob, DrmConnector, DrmCrtc, DrmEncoder, DrmError, DrmFb, DrmFramebuffer, DrmMaster, DrmModeInfo, DrmObject, DrmPlane, DrmProperty, DrmPropertyDefinition, DrmPropertyType, PropBlob, DRM_CLIENT_CAP_ATOMIC, DRM_MODE_ATOMIC_ALLOW_MODESET, DRM_MODE_ATOMIC_NONBLOCK, DRM_MODE_PAGE_FLIP_EVENT, DrmEvent};
use crate::drm::drm::{
ConnectorStatus, ConnectorType, DrmBlob, DrmConnector, DrmCrtc, DrmEncoder, DrmError, DrmEvent,
DrmFb, DrmFramebuffer, DrmMaster, DrmModeInfo, DrmObject, DrmPlane, DrmProperty,
DrmPropertyDefinition, DrmPropertyType, PropBlob, DRM_CLIENT_CAP_ATOMIC,
DRM_MODE_ATOMIC_ALLOW_MODESET, DRM_MODE_ATOMIC_NONBLOCK, DRM_MODE_PAGE_FLIP_EVENT,
};
use crate::drm::gbm::{GbmDevice, GBM_BO_USE_RENDERING, GBM_BO_USE_SCANOUT};
use crate::drm::{ModifiedFormat, INVALID_MODIFIER};
use crate::format::{Format, XRGB8888};
@ -14,7 +20,6 @@ use std::ffi::CString;
use std::fmt::{Debug, Formatter};
use std::rc::Rc;
use uapi::c;
use crate::async_engine::{AsyncFd, SpawnedFuture};
pub struct PendingDrmDevice {
pub id: DrmId,
@ -462,14 +467,14 @@ impl MetalBackend {
let connectors = get_connectors(&self.state, &dev, &resources.connectors)?;
let slf = Rc::new(MetalDrmDevice {
dev,
connectors,
});
let slf = Rc::new(MetalDrmDevice { dev, connectors });
self.reset_drm_device(&slf)?;
let handler = self.state.eng.spawn(self.clone().handle_drm_events(slf.clone()));
let handler = self
.state
.eng
.spawn(self.clone().handle_drm_events(slf.clone()));
slf.dev.handle_events.handle_events.set(Some(handler));
self.state.render_ctx.set(Some(egl));
@ -498,13 +503,23 @@ impl MetalBackend {
fn handle_drm_event(self: &Rc<Self>, event: DrmEvent, dev: &Rc<MetalDrmDevice>) {
match event {
DrmEvent::FlipComplete { tv_sec, tv_usec, sequence, crtc_id } => self.handle_drm_flip_event(
dev, crtc_id, tv_sec, tv_usec, sequence
),
DrmEvent::FlipComplete {
tv_sec,
tv_usec,
sequence,
crtc_id,
} => self.handle_drm_flip_event(dev, crtc_id, tv_sec, tv_usec, sequence),
}
}
fn handle_drm_flip_event(self: &Rc<Self>, dev: &Rc<MetalDrmDevice>, crtc_id: DrmCrtc, _tv_sec: u32, _tv_usec: u32, _sequence: u32) {
fn handle_drm_flip_event(
self: &Rc<Self>,
dev: &Rc<MetalDrmDevice>,
crtc_id: DrmCrtc,
_tv_sec: u32,
_tv_usec: u32,
_sequence: u32,
) {
let crtc = match dev.dev.crtcs.get(&crtc_id) {
Some(c) => c,
_ => return,
@ -559,15 +574,26 @@ impl MetalBackend {
}
}
fn create_scanout_buffers(&self, dev: &Rc<MetalDrmDevice>, connector: &Rc<MetalConnector>, format: &ModifiedFormat, width: i32, height: i32) -> Result<[RenderBuffer; 2], MetalError> {
fn create_scanout_buffers(
&self,
dev: &Rc<MetalDrmDevice>,
connector: &Rc<MetalConnector>,
format: &ModifiedFormat,
width: i32,
height: i32,
) -> Result<[RenderBuffer; 2], MetalError> {
let create = || self.create_scanout_buffer(dev, connector, format, width, height);
Ok([
create()?,
create()?,
])
Ok([create()?, create()?])
}
fn create_scanout_buffer(&self, dev: &Rc<MetalDrmDevice>, connector: &Rc<MetalConnector>, format: &ModifiedFormat, width: i32, height: i32) -> Result<RenderBuffer, MetalError> {
fn create_scanout_buffer(
&self,
dev: &Rc<MetalDrmDevice>,
connector: &Rc<MetalConnector>,
format: &ModifiedFormat,
width: i32,
height: i32,
) -> Result<RenderBuffer, MetalError> {
let bo = dev.dev.gbm.create_bo(
width,
height,
@ -628,7 +654,13 @@ impl MetalBackend {
format: XRGB8888,
modifier: INVALID_MODIFIER,
};
let buffers = self.create_scanout_buffers(dev, connector, &format, mode.hdisplay as _, mode.vdisplay as _)?;
let buffers = self.create_scanout_buffers(
dev,
connector,
&format,
mode.hdisplay as _,
mode.vdisplay as _,
)?;
let mut changes = connector.master.change(DRM_MODE_ATOMIC_ALLOW_MODESET);
changes.change_object(connector.id, |c| {
c.change(connector.crtc_id.id, crtc.id.0 as _);
@ -694,9 +726,13 @@ impl MetalBackend {
};
let buffer = &buffers[connector.next_buffer.fetch_add(1) % buffers.len()];
if let Some(node) = self.state.root.outputs.get(&connector.output_id) {
buffer.egl.render(&*node, &self.state, Some(node.position.get()));
buffer
.egl
.render(&*node, &self.state, Some(node.position.get()));
}
let mut changes = connector.master.change(DRM_MODE_ATOMIC_NONBLOCK | DRM_MODE_PAGE_FLIP_EVENT);
let mut changes = connector
.master
.change(DRM_MODE_ATOMIC_NONBLOCK | DRM_MODE_PAGE_FLIP_EVENT);
changes.change_object(plane.id, |c| {
c.change(plane.fb_id.id, buffer.drm.id().0 as _);
});