fixup! drm/asahi: Add the Asahi driver for Apple AGX GPUs

Author: jannau

drivers/gpu/drm/asahi/debug.rs

@@ -75,7 +75,7 @@ pub(crate) enum DebugFlags {
 
 /// Update the cached global debug flags from the module parameter
 pub(crate) fn update_debug_flags() {
-    let flags = *module_parameters::debug_flags.get();
+    let flags = *module_parameters::debug_flags.value();
 
     DEBUG_FLAGS.store(flags, Ordering::Relaxed);
 }

drivers/gpu/drm/asahi/driver.rs

@@ -158,7 +158,7 @@ impl platform::Driver for AsahiDriver {
         res.init_mmio()?;
 
         // Start the coprocessor CPU, so UAT can initialize the handoff
-        res.start_cpu()?;
+        regs::Resources::start_cpu(pdev)?;
 
         let node = pdev.as_ref().of_node().ok_or(EIO)?;
         let compat: KVec<u32> = node.get_property(c_str!("apple,firmware-compat"))?;

drivers/gpu/drm/asahi/file.rs

@@ -145,7 +145,7 @@ impl SyncItem {
         let size = STRIDE * count as usize;
 
         // SAFETY: We only read this once, so there are no TOCTOU issues.
-        let mut reader = UserSlice::new(ptr as UserPtr, size).reader();
+        let mut reader = UserSlice::new(UserPtr::from_addr(ptr as _), size).reader();
 
         for i in 0..count {
             let mut sync: MaybeUninit<uapi::drm_asahi_sync> = MaybeUninit::uninit();

drivers/gpu/drm/asahi/initdata.rs

@@ -54,7 +54,7 @@ impl<'a> InitDataBuilder::ver<'a> {
     fn hw_shared1(cfg: &'static hw::HwConfig) -> impl Init<raw::HwDataShared1> {
         init!(raw::HwDataShared1 {
             unk_a4: cfg.shared1_a4,
-            ..Zeroable::zeroed()
+            ..Zeroable::init_zeroed()
         })
         .chain(|ret| {
             for (i, val) in cfg.shared1_tab.iter().enumerate() {
@@ -96,7 +96,7 @@ impl<'a> InitDataBuilder::ver<'a> {
             unk_28: Array::new([0xff; 16]),
             g14: Default::default(),
             unk_508: cfg.shared2_unk_508,
-            ..Zeroable::zeroed()
+            ..Zeroable::init_zeroed()
         })
         .chain(|ret| {
             for (i, val) in cfg.shared2_tab.iter().enumerate() {
@@ -791,7 +791,7 @@ impl<'a> InitDataBuilder::ver<'a> {
                     unk_11edc: 0,
                     #[ver(V >= V13_0B4)]
                     unk_11efc: 0,
-                    ..Zeroable::zeroed()
+                    ..Zeroable::init_zeroed()
                 })
                 .chain(|raw| {
                     for (i, pz) in self.dyncfg.pwr.power_zones.iter().enumerate() {

drivers/gpu/drm/asahi/mmu.rs

@@ -859,7 +859,7 @@ impl Handoff {
         self.unk3.store(0, Ordering::Relaxed);
         fence(Ordering::SeqCst);
 
-        let start = Instant::now();
+        let start = Instant::<Monotonic>::now();
         const TIMEOUT: Delta = Delta::from_millis(1000);
 
         self.lock();

drivers/gpu/drm/asahi/queue/mod.rs

@@ -154,8 +154,6 @@ impl JobFence::ver {
 #[versions(AGX)]
 #[vtable]
 impl dma_fence::FenceOps for JobFence::ver {
-    const USE_64BIT_SEQNO: bool = true;
-
     fn get_driver_name<'a>(self: &'a FenceObject<Self>) -> &'a CStr {
         c_str!("asahi")
     }

drivers/gpu/drm/asahi/regs.rs

@@ -201,12 +201,13 @@ impl Resources {
     }
 
     /// Start the ASC coprocessor CPU.
-    pub(crate) fn start_cpu(&self) -> Result {
-        let res = self.asc.try_access().ok_or(ENXIO)?;
-        let val = res.read32_relaxed(CPU_CONTROL);
+    pub(crate) fn start_cpu(pdev: &platform::Device<Core>) -> Result {
+        let asc_req = pdev.io_request_by_name(c_str!("asc")).ok_or(EINVAL)?;
+        let asc_iomem = KBox::pin_init(asc_req.iomap_sized::<ASC_CTL_SIZE>(), GFP_KERNEL)?;
+        let res = asc_iomem.access(pdev.as_ref())?;
 
+        let val = res.read32_relaxed(CPU_CONTROL);
         res.write32_relaxed(val | CPU_RUN, CPU_CONTROL);
-
         Ok(())
     }