Skip to content

Commit e659d41

Browse files
committed
drm/asahi: gpu: Force Box move with manual Box<T>::into_inner()
TODO: Investigate why this doesn't work automatically. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 061f957 commit e659d41

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/gpu/drm/asahi/gpu.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,18 +698,18 @@ impl GpuManager::ver {
698698
try_pin_init!(GpuManager::ver {
699699
dev: dev.into(),
700700
cfg,
701-
dyncfg: *dyncfg,
702-
initdata: *initdata,
703-
uat: *uat,
701+
dyncfg: KBox::<hw::DynConfig>::into_inner(dyncfg),
702+
initdata: KBox::<fw::types::GpuObject<fw::initdata::InitData::ver>>::into_inner(initdata),
703+
uat: KBox::<mmu::Uat>::into_inner(uat),
704704
io_mappings: KVec::new(),
705705
next_mmio_iova: IOVA_KERN_MMIO_RANGE.start,
706706
rtkit <- Mutex::new_named(None, c_str!("rtkit")),
707707
crashed: AtomicBool::new(false),
708708
event_manager,
709709
alloc <- Mutex::new_named(alloc, c_str!("alloc")),
710710
fwctl_channel <- Mutex::new_named(fwctl_channel, c_str!("fwctl_channel")),
711-
rx_channels <- Mutex::new_named(*rx_channels, c_str!("rx_channels")),
712-
tx_channels <- Mutex::new_named(*tx_channels, c_str!("tx_channels")),
711+
rx_channels <- Mutex::new_named(KBox::<RxChannels::ver>::into_inner(rx_channels), c_str!("rx_channels")),
712+
tx_channels <- Mutex::new_named(KBox::<TxChannels::ver>::into_inner(tx_channels), c_str!("tx_channels")),
713713
pipes,
714714
buffer_mgr,
715715
ids: Default::default(),

0 commit comments

Comments
 (0)