Skip to content

Commit 3593cae

Browse files
committed
fixup! drm/asahi: Convert more ranges to Range<>
Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 458dbaa commit 3593cae

1 file changed

Lines changed: 30 additions & 24 deletions

File tree

drivers/gpu/drm/asahi/gpu.rs

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -684,31 +684,37 @@ impl GpuManager::ver {
684684
let tx_channels = Box::init(try_init!(TxChannels::ver {
685685
device_control: channel::DeviceControlChannel::ver::new(dev, alloc_ref)?,
686686
}))?;
687+
let tx_channels = Box::init(
688+
try_init!(TxChannels::ver {
689+
device_control: channel::DeviceControlChannel::ver::new(dev, alloc_ref)?,
690+
}),
691+
GFP_KERNEL,
692+
)?;
687693

688-
let x = UniqueArc::pin_init(try_pin_init!(GpuManager::ver {
689-
dev: dev.into(),
690-
cfg,
691-
dyncfg: *dyncfg,
692-
initdata: *initdata,
693-
uat: *uat,
694-
io_mappings: Vec::new(),
695-
next_mmio_iova: IOVA_KERN_MMIO_RANGE.start,
696-
rtkit <- Mutex::new_named(None, c_str!("rtkit")),
697-
crashed: AtomicBool::new(false),
698-
event_manager,
699-
alloc <- Mutex::new_named(alloc, c_str!("alloc")),
700-
fwctl_channel <- Mutex::new_named(fwctl_channel, c_str!("fwctl_channel")),
701-
rx_channels <- Mutex::new_named(*rx_channels, c_str!("rx_channels")),
702-
tx_channels <- Mutex::new_named(*tx_channels, c_str!("tx_channels")),
703-
pipes,
704-
buffer_mgr,
705-
ids: Default::default(),
706-
garbage_work <- Mutex::new_named(Vec::new(), c_str!("garbage_work")),
707-
garbage_contexts <- Mutex::new_named(Vec::new(), c_str!("garbage_contexts")),
708-
}))?;
709-
710-
Ok(x)
711-
}
694+
let x = UniqueArc::pin_init(
695+
try_pin_init!(GpuManager::ver {
696+
dev: dev.into(),
697+
cfg,
698+
dyncfg: *dyncfg,
699+
initdata: *initdata,
700+
uat: *uat,
701+
io_mappings: Vec::new(),
702+
next_mmio_iova: IOVA_KERN_MMIO_RANGE.start,
703+
rtkit <- Mutex::new_named(None, c_str!("rtkit")),
704+
crashed: AtomicBool::new(false),
705+
event_manager,
706+
alloc <- Mutex::new_named(alloc, c_str!("alloc")),
707+
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")),
710+
pipes,
711+
buffer_mgr,
712+
ids: Default::default(),
713+
garbage_work <- Mutex::new_named(Vec::new(), c_str!("garbage_work")),
714+
garbage_contexts <- Mutex::new_named(Vec::new(), c_str!("garbage_contexts")),
715+
}),
716+
GFP_KERNEL,
717+
)?;
712718

713719
/// Fetch and validate the GPU dynamic configuration from the device tree and hardware.
714720
///

0 commit comments

Comments
 (0)