Skip to content

Commit 94d9465

Browse files
hoshinolinajannau
authored andcommitted
drm/asahi: workqueue: Work around ICE in Rust 1.74
Signed-off-by: Asahi Lina <lina@asahilina.net>
1 parent 3c4c2f2 commit 94d9465

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

drivers/gpu/drm/asahi/workqueue.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -658,16 +658,17 @@ impl WorkQueue::ver {
658658

659659
let info_pointer = inner.info.weak_pointer();
660660

661-
let mutex_init = match pipe_type {
662-
PipeType::Vertex => Mutex::new_named(inner, c_str!("WorkQueue::inner (Vertex)")),
663-
PipeType::Fragment => Mutex::new_named(inner, c_str!("WorkQueue::inner (Fragment)")),
664-
PipeType::Compute => Mutex::new_named(inner, c_str!("WorkQueue::inner (Compute)")),
665-
};
666-
667-
Arc::pin_init(pin_init!(Self {
668-
info_pointer,
669-
inner <- mutex_init,
670-
}))
661+
Arc::pin_init(
662+
pin_init!(Self {
663+
info_pointer,
664+
inner <- match pipe_type {
665+
PipeType::Vertex => Mutex::new_named(inner, c_str!("WorkQueue::inner (Vertex)")),
666+
PipeType::Fragment => Mutex::new_named(inner, c_str!("WorkQueue::inner (Fragment)")),
667+
PipeType::Compute => Mutex::new_named(inner, c_str!("WorkQueue::inner (Compute)")),
668+
},
669+
}),
670+
GFP_KERNEL,
671+
)
671672
}
672673

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

0 commit comments

Comments
 (0)