Skip to content

drm/asahi: workqueue: Defer freeing the last completed work item #493

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

Closed
RyanTheTide wants to merge 1 commit into from
Closed

drm/asahi: workqueue: Defer freeing the last completed work item #493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion drivers/gpu/drm/asahi/workqueue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ struct WorkQueueInner {
size: u32,
wptr: u32,
pending: KVec<Pin<KBox<SubmittedWorkContainer>>>,
last_completed_work: Option<Pin<KBox<SubmittedWorkContainer>>>,
last_token: Option<event::Token>,
pending_jobs: usize,
last_submitted: Option<event::EventValue>,
Expand Down Expand Up @@ -740,6 +741,7 @@ impl WorkQueue::ver {
size,
wptr: 0,
pending: KVec::new(),
last_completed_work: None,
last_token: None,
event: None,
priority,
Expand Down Expand Up @@ -933,16 +935,22 @@ impl WorkQueue for WorkQueue::ver {
let last_wptr = inner.pending[completed_commands - 1].inner.wptr();
let pipe_type = inner.pipe_type;

let mut last_cmd = inner.last_completed_work.take();

for mut cmd in inner.pending.drain(..completed_commands) {
mod_pr_debug!(
"WorkQueue({:?}): Queueing command @ {:?} for cleanup\n",
pipe_type,
cmd.inner.gpu_va()
);
cmd.as_mut().inner_mut().complete();
workqueue::system_dfl().enqueue(cmd);
if let Some(last_cmd) = last_cmd.replace(cmd) {
workqueue::system_dfl().enqueue(last_cmd);
}
}

inner.last_completed_work = last_cmd;

mod_pr_debug!(
"WorkQueue({:?}): Completed {} commands, left pending {}, ls {:#x?}, lc {:#x?}\n",
inner.pipe_type,
Expand Down Expand Up @@ -1039,3 +1047,12 @@ impl WorkQueue for WorkQueue::ver {
}
}
}

#[versions(AGX)]
impl Drop for WorkQueueInner::ver {
fn drop(&mut self) {
if let Some(last_cmd) = self.last_completed_work.take() {
workqueue::system_dfl().enqueue(last_cmd);
}
}
}