Skip to content

Commit 458dbaa

Browse files
committed
fixup! drm/asahi: Expose firmware version to userspace
Signed-off-by: Janne Grunau <j@jannau.net>
1 parent eb4301c commit 458dbaa

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

drivers/gpu/drm/asahi/gpu.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -814,12 +814,15 @@ impl GpuManager::ver {
814814
}
815815

816816
/// Create the global GPU event manager, and return an `Arc<>` to it.
817-
fn make_event_manager(alloc: &mut KernelAllocators) -> Result<Arc<event::EventManager>> {
818-
Ok(Arc::try_new(event::EventManager::new(alloc)?)?)
819-
}
820-
821-
/// Create a new MMIO mapping and add it to the mappings list in initdata at the specified
822-
/// index.
817+
Ok(Box::new(
818+
hw::DynConfig {
819+
pwr: pwr_cfg,
820+
uat_ttb_base: uat.ttb_base(),
821+
id: gpu_id,
822+
firmware_version: node.get_property(c_str!("apple,firmware-version"))?,
823+
},
824+
GFP_KERNEL,
825+
)?)
823826
fn iomap(
824827
this: &mut Pin<UniqueArc<GpuManager::ver>>,
825828
cfg: &'static hw::HwConfig,

0 commit comments

Comments
 (0)