Skip to content

Commit bd393e6

Browse files
committed
fixup! drm/asahi: workqueue: Work around ICE in Rust 1.74
Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 7734e18 commit bd393e6

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

drivers/gpu/drm/asahi/workqueue.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -667,14 +667,17 @@ impl WorkQueue::ver {
667667

668668
let info_pointer = inner.info.weak_pointer();
669669

670-
Arc::pin_init(pin_init!(Self {
671-
info_pointer,
672-
inner <- match pipe_type {
673-
PipeType::Vertex => Mutex::new_named(inner, c_str!("WorkQueue::inner (Vertex)")),
674-
PipeType::Fragment => Mutex::new_named(inner, c_str!("WorkQueue::inner (Fragment)")),
675-
PipeType::Compute => Mutex::new_named(inner, c_str!("WorkQueue::inner (Compute)")),
676-
},
677-
}))
670+
Arc::pin_init(
671+
pin_init!(Self {
672+
info_pointer,
673+
inner <- match pipe_type {
674+
PipeType::Vertex => Mutex::new_named(inner, c_str!("WorkQueue::inner (Vertex)")),
675+
PipeType::Fragment => Mutex::new_named(inner, c_str!("WorkQueue::inner (Fragment)")),
676+
PipeType::Compute => Mutex::new_named(inner, c_str!("WorkQueue::inner (Compute)")),
677+
},
678+
}),
679+
GFP_KERNEL,
680+
)
678681
}
679682

680683
pub(crate) fn event_info(&self) -> Option<QueueEventInfo::ver> {

0 commit comments

Comments
 (0)