diff --git a/drivers/gpu/drm/asahi/g17/runtime/compute_exit.rs b/drivers/gpu/drm/asahi/g17/runtime/compute_exit.rs
index 41960369b04a3..9e12842f41c02 100644
--- a/drivers/gpu/drm/asahi/g17/runtime/compute_exit.rs
+++ b/drivers/gpu/drm/asahi/g17/runtime/compute_exit.rs
@@ -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())
@@ -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)) {
@@ -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;
diff --git a/drivers/gpu/drm/asahi/g17/runtime/render/teardown.rs b/drivers/gpu/drm/asahi/g17/runtime/render/teardown.rs
index 8f3ee6f3b15bd..fffa6d28dd289 100644
--- a/drivers/gpu/drm/asahi/g17/runtime/render/teardown.rs
+++ b/drivers/gpu/drm/asahi/g17/runtime/render/teardown.rs
@@ -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,