Skip to content

drm/asahi: G17 kill flag order and keep_graph() doc comment #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DjDeveloperr merged 2 commits into from
Oct 28, 2026
Merged

drm/asahi: G17 kill flag order and keep_graph() doc comment #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf79f1
drm/asahi: give keep_graph() its doc comment back
DjDeveloperr Oct 28, 2026
5c9e924
drm/asahi: mark a G17 context killed right after the kill is published
DjDeveloperr Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions drivers/gpu/drm/asahi/g17/runtime/compute_exit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,11 @@ impl Firmware {
self.queues.admission.release_exit_kill_hold(hold);
return if error == EAGAIN { Ok(()) } else { Err(error) };
}
// Publication is irrevocable even if its doorbell fails. Keep the killed
// graph until processor stop, and the held render identities until this
// context's scheduler release is consumed or processors stop.
// Publication is irrevocable even if its doorbell fails, so mark the context
// killed before anything below can fail. Keep the killed graph until processor
// stop, and the held render identities until this context's scheduler release
// is consumed or processors stop.
context.note_kill_published();
let mut queue = self.queues.compute[index]
.as_mut()
.and_then(|entry| entry.queue.as_deref_mut())
Expand All @@ -306,7 +308,6 @@ impl Firmware {
PRESSED_KILL_NS.store(now.max(1), Ordering::Relaxed);
}
queue.record_exit(cookie, now);
context.note_kill_published();
crate::g17::trace::teardown(3, cookie, u64::from(context.id()), hold | u64::from(beside));
fence(Ordering::SeqCst);
if let Err(error) = queue.announce_exit(now, || self.primary.notify(MSG_CONTROL_NOTIFY)) {
Expand Down Expand Up @@ -403,10 +404,11 @@ impl Firmware {
self.queues.admission.release_exit_kill_hold(hold);
return if error == EAGAIN { Ok(()) } else { Err(error) };
}
// Publication is irrevocable. The held pairs stay held until this context's
// scheduler release is consumed (`release_killed_slots` at detach).
self.queues.teardown.record_render_kill(index, cookie, now)?;
// Publication is irrevocable, so mark the context killed before anything below
// can fail. The held pairs stay held until this context's scheduler release is
// consumed (`release_killed_slots` at detach).
context.note_kill_published();
self.queues.teardown.record_render_kill(index, cookie, now)?;
record_kill_wait(self.queues.teardown.take_kill_wait(index, now));
if beside {
*pressed = false;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/asahi/g17/runtime/render/teardown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,11 @@ impl Registry {
}
}

/// Keeps `graph` until the firmware stops; if even that cannot be recorded, it is leaked
/// rather than freed.
/// Graphs that could not be recorded in `kept_graphs` and were leaked instead, for debugfs.
pub(super) static LEAKED_GRAPHS: core::sync::atomic::AtomicU32 = core::sync::atomic::AtomicU32::new(0);

/// Keeps `graph` until the firmware stops; if even that cannot be recorded, it is leaked
/// rather than freed.
fn keep_graph(
kept: &mut KVec<crate::g17::queue::render::RetiredBinding>,
graph: crate::g17::queue::render::RetiredBinding,
Expand Down