Skip to content

Commit 9b6c69c

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 9c4d645 commit 9b6c69c

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
@@ -695,18 +695,18 @@ impl GpuManager::ver {
695695
try_pin_init!(GpuManager::ver {
696696
dev: dev.into(),
697697
cfg,
698-
dyncfg: *dyncfg,
699-
initdata: *initdata,
700-
uat: *uat,
698+
dyncfg: KBox::<hw::DynConfig>::into_inner(dyncfg),
699+
initdata: KBox::<fw::types::GpuObject<fw::initdata::InitData::ver>>::into_inner(initdata),
700+
uat: KBox::<mmu::Uat>::into_inner(uat),
701701
io_mappings: KVec::new(),
702702
next_mmio_iova: IOVA_KERN_MMIO_RANGE.start,
703703
rtkit <- Mutex::new_named(None, c_str!("rtkit")),
704704
crashed: AtomicBool::new(false),
705705
event_manager,
706706
alloc <- Mutex::new_named(alloc, c_str!("alloc")),
707707
fwctl_channel <- Mutex::new_named(fwctl_channel, c_str!("fwctl_channel")),
708-
rx_channels <- Mutex::new_named(*rx_channels, c_str!("rx_channels")),
709-
tx_channels <- Mutex::new_named(*tx_channels, c_str!("tx_channels")),
708+
rx_channels <- Mutex::new_named(KBox::<RxChannels::ver>::into_inner(rx_channels), c_str!("rx_channels")),
709+
tx_channels <- Mutex::new_named(KBox::<TxChannels::ver>::into_inner(tx_channels), c_str!("tx_channels")),
710710
pipes,
711711
buffer_mgr,
712712
ids: Default::default(),

0 commit comments

Comments
 (0)