Skip to content

Commit b9ad34c

Browse files
committed
drm/asahi: workqueue: Work around ICE in Rust 1.74
Signed-off-by: Asahi Lina <lina@asahilina.net>
1 parent 3ac16f2 commit b9ad34c

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

drivers/gpu/drm/asahi/workqueue.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -648,15 +648,13 @@ impl WorkQueue::ver {
648648

649649
let info_pointer = inner.info.weak_pointer();
650650

651-
let mutex_init = match pipe_type {
652-
PipeType::Vertex => Mutex::new_named(inner, c_str!("WorkQueue::inner (Vertex)")),
653-
PipeType::Fragment => Mutex::new_named(inner, c_str!("WorkQueue::inner (Fragment)")),
654-
PipeType::Compute => Mutex::new_named(inner, c_str!("WorkQueue::inner (Compute)")),
655-
};
656-
657651
Arc::pin_init(pin_init!(Self {
658652
info_pointer,
659-
inner <- mutex_init,
653+
inner <- match pipe_type {
654+
PipeType::Vertex => Mutex::new_named(inner, c_str!("WorkQueue::inner (Vertex)")),
655+
PipeType::Fragment => Mutex::new_named(inner, c_str!("WorkQueue::inner (Fragment)")),
656+
PipeType::Compute => Mutex::new_named(inner, c_str!("WorkQueue::inner (Compute)")),
657+
},
660658
}))
661659
}
662660

0 commit comments

Comments
 (0)