Skip to content

Commit e6f9f9e

Browse files
jannaujohn-cabaj
authored andcommitted
fixup! drm/asahi: Add the Asahi driver for Apple AGX GPUs
Fix condvar usage after 0a7f5ba ("rust: sync: Makes `CondVar::wait()` an uninterruptible wait") Signed-off-by: Janne Grunau <j@jannau.net> (cherry picked from commit 2089cd9 https://github.com/AsahiLinux/linux) Signed-off-by: John Cabaj <john.cabaj@canonical.com>
1 parent e57db80 commit e6f9f9e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/asahi/slotalloc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ impl<T: SlotItem> SlotAllocator<T> {
231231
);
232232
}
233233
first = false;
234-
if self.0.cond.wait(&mut inner) {
234+
if self.0.cond.wait_interruptible(&mut inner) {
235235
return Err(ERESTARTSYS);
236236
}
237237
} else {

0 commit comments

Comments
 (0)