leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kms: Use new DrmOutput api

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-01-02 17:38:59 +01:00 • committed by Victoria Brekenfeld
parent e356e3c589
commit 8b87d6524e
10 changed files with 347 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/wayland/handlers/drm_lease.rs
View file

@ -32,8 +32,7 @@ impl DrmLeaseHandler for State {
.drm_devices
.get_mut(&node)
.ok_or(LeaseRejected::default())?;
let mut builder = DrmLeaseBuilder::new(&backend.drm);
let mut builder = DrmLeaseBuilder::new(backend.drm.device());
for conn in request.connectors {
if let Some((_, crtc)) = backend
.leased_connectors
@ -44,6 +43,7 @@ impl DrmLeaseHandler for State {
builder.add_crtc(*crtc);
let planes = backend
.drm
.device()
.planes(crtc)
.map_err(LeaseRejected::with_cause)?;
let (primary_plane, primary_plane_claim) = planes
@ -52,6 +52,7 @@ impl DrmLeaseHandler for State {
.find_map(|plane| {
backend
.drm
.device_mut()
.claim_plane(plane.handle, *crtc)
.map(|claim| (plane, claim))
})
@ -60,6 +61,7 @@ impl DrmLeaseHandler for State {
if let Some((cursor, claim)) = planes.cursor.into_iter().find_map(|plane| {
backend
.drm
.device_mut()
.claim_plane(plane.handle, *crtc)
.map(|claim| (plane, claim))
}) {

2
src/wayland/handlers/output_configuration.rs
View file

@ -140,6 +140,7 @@ impl State {
&mut self.common.workspace_state.update(),
&self.common.xdg_activation_state,
self.common.startup_done.clone(),
&self.common.clock,
);
if let Err(err) = res {
warn!(?err, "Failed to apply config. Resetting");
@ -161,6 +162,7 @@ impl State {
&mut self.common.workspace_state.update(),
&self.common.xdg_activation_state,
self.common.startup_done.clone(),
&self.common.clock,
) {
error!(?err, "Failed to reset output config.");
}