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

metal: handle gpu reset

Browse source 
Unfortunately this doesn't seem to work on amdgpu [1]. I've tested that
it works on i915.

[1] https://gitlab.freedesktop.org/drm/amd/-/issues/1749
This commit is contained in:
Julian Orth 2022-05-06 13:09:29 +02:00
parent 4584dee160
commit d2913449ea
21 changed files with 377 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/backends/metal.rs
View file

@ -9,7 +9,7 @@ use {
Backend, BackendEvent, InputDevice, InputDeviceAccelProfile, InputDeviceCapability,
InputDeviceId, InputEvent, KeyState, TransformMatrix,
},
backends::metal::video::{MetalDrmDevice, PendingDrmDevice},
backends::metal::video::{MetalDrmDevice, MetalRenderContext, PendingDrmDevice},
dbus::{DbusError, SignalHandler},
libinput::{
consts::{
@ -44,6 +44,7 @@ use {
cell::{Cell, RefCell},
error::Error,
ffi::{CStr, CString},
fmt::{Debug, Formatter},
future::pending,
mem,
rc::Rc,
@ -82,7 +83,7 @@ pub enum MetalError {
NoModeForConnector,
#[error("Could not allocate scanout buffer")]
ScanoutBuffer(#[source] GbmError),
#[error("Could not create a framebuffer")]
#[error("addfb2 failed")]
Framebuffer(#[source] DrmError),
#[error("Could not import a framebuffer into EGL")]
ImportFb(#[source] RenderError),
@ -124,6 +125,13 @@ pub struct MetalBackend {
drm_ids: DrmIds,
pause_handler: Cell<Option<SignalHandler>>,
resume_handler: Cell<Option<SignalHandler>>,
ctx: CloneCell<Option<Rc<MetalRenderContext>>>,
}
impl Debug for MetalBackend {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.debug_struct("MetalBackend").finish_non_exhaustive()
}
}
impl MetalBackend {
@ -250,6 +258,7 @@ pub async fn create(state: &Rc<State>) -> Result<Rc<MetalBackend>, MetalError> {
drm_ids: Default::default(),
pause_handler: Default::default(),
resume_handler: Default::default(),
ctx: Default::default(),
});
metal.pause_handler.set(Some({
let mtl = metal.clone();