Miroirs/smithay
1
0
Fork 0
mirror of https://github.com/Smithay/smithay.git synced 2024-09-28 03:21:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

anvil: reset drm state on test failure

Browse source 
this changes session resume to an optimistic
path, we first assume our state is good after
a session resume and only reset the whole
state if we hit a test failure on commit.
This commit is contained in:
Christian Meissl 2024-01-21 12:38:03 +01:00
parent 10320a4def
commit c2bdc9e6ce
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
anvil/src/udev.rs
View file

@ -313,17 +313,24 @@ pub fn run_udev() {
.iter_mut()
.map(|(handle, backend)| (*handle, backend))
{
// disable all connectors and reset the internal state of
// the device and all known surfaces to prevent issues with
// conflicting requirements after a tty switch where we can't be
// sure another drm master left the state in a usable way
// if we do not care about flicking (caused by modesetting) we could just
// pass true for disable connectors here. this would make sure our drm
// device is in a known state (all connectors and planes disabled).
// but for demonstration we choose a more optimistic path by leaving the
// state as is and assume it will just work. If this assumption fails
// we will try to reset the state when trying to queue a frame.
backend
.drm
.activate(true)
.activate(false)
.expect("failed to activate drm backend");
if let Some(lease_global) = backend.leasing_global.as_mut() {
lease_global.resume::<AnvilState<UdevData>>();
}
for surface in backend.surfaces.values_mut() {
if let Err(err) = surface.compositor.surface().reset_state() {
warn!("Failed to reset drm surface state: {}", err);
}
}
handle.insert_idle(move |data| data.state.render(node, None));
}
}
@ -1488,7 +1495,16 @@ impl AnvilState<UdevData> {
}
_ => false,
},
SwapBuffersError::ContextLost(err) => panic!("Rendering loop lost: {}", err),
SwapBuffersError::ContextLost(err) => match err.downcast_ref::<DrmError>() {
Some(DrmError::TestFailed(_)) => {
// reset the complete state, disabling all connectors and planes in case we hit a test failed
// most likely we hit this after a tty switch when a foreign master changed CRTC <-> connector bindings
// and we run in a mismatch
device.drm.reset_state().expect("failed to reset drm device");
true
}
_ => panic!("Rendering loop lost: {}", err),
},
}
}
};