drm/asahi: Implement GEM objects sharing a single DMA resv

Signed-off-by: Asahi Lina <lina@asahilina.net>

Author: hoshinolina

drivers/gpu/drm/asahi/file.rs

@@ -409,21 +409,21 @@ impl File {
             return Err(EINVAL);
         }
 
-        let vm_id = if data.flags & uapi::ASAHI_GEM_VM_PRIVATE != 0 {
+        let resv_obj = if data.flags & uapi::ASAHI_GEM_VM_PRIVATE != 0 {
             Some(
                 file.inner()
                     .vms()
                     .get(data.vm_id.try_into()?)
                     .ok_or(ENOENT)?
                     .borrow()
                     .vm
-                    .id(),
+                    .get_resv_obj(),
             )
         } else {
             None
         };
 
-        let bo = gem::new_object(device, data.size.try_into()?, data.flags, vm_id)?;
+        let bo = gem::new_object(device, data.size.try_into()?, data.flags, resv_obj.as_ref())?;
 
         let handle = bo.gem.create_handle(file)?;
         data.handle = handle;

drivers/gpu/drm/asahi/gem.rs

@@ -30,8 +30,6 @@ pub(crate) struct DriverObject {
     kernel: bool,
     /// Object creation flags.
     flags: u32,
-    /// VM ID for VM-private objects.
-    vm_id: Option<u64>,
     /// ID for debug
     id: u64,
 }
@@ -82,12 +80,10 @@ impl ObjectRef {
         prot: u32,
         guard: bool,
     ) -> Result<crate::mmu::KernelMapping> {
-        let vm_id = vm.id();
-
-        if self.gem.vm_id.is_some() && self.gem.vm_id != Some(vm_id) {
+        // Only used for kernel objects now
+        if !self.gem.kernel {
             return Err(EINVAL);
         }
-
         vm.map_in_range(self.gem.size(), &self.gem, alignment, range, prot, guard)
     }
 
@@ -101,9 +97,7 @@ impl ObjectRef {
         prot: u32,
         guard: bool,
     ) -> Result<crate::mmu::KernelMapping> {
-        let vm_id = vm.id();
-
-        if self.gem.vm_id.is_some() && self.gem.vm_id != Some(vm_id) {
+        if self.gem.flags & uapi::ASAHI_GEM_VM_PRIVATE != 0 && vm.is_extobj(&self.gem) {
             return Err(EINVAL);
         }
 
@@ -128,21 +122,23 @@ pub(crate) fn new_object(
     dev: &AsahiDevice,
     size: usize,
     flags: u32,
-    vm_id: Option<u64>,
+    parent_object: Option<&gem::ObjectRef<Object>>,
 ) -> Result<ObjectRef> {
+    if (flags & uapi::ASAHI_GEM_VM_PRIVATE != 0) != parent_object.is_some() {
+        return Err(EINVAL);
+    }
+
     let mut gem = shmem::Object::<DriverObject>::new(dev, align(size, mmu::UAT_PGSZ))?;
     gem.kernel = false;
     gem.flags = flags;
-    gem.vm_id = vm_id;
 
-    gem.set_exportable(vm_id.is_none());
+    gem.set_exportable(parent_object.is_none());
     gem.set_wc(flags & uapi::ASAHI_GEM_WRITEBACK == 0);
+    if let Some(parent) = parent_object {
+        gem.share_dma_resv(&**parent)?;
+    }
 
-    mod_pr_debug!(
-        "DriverObject new user object: vm_id={:?} id={}\n",
-        vm_id,
-        gem.id
-    );
+    mod_pr_debug!("DriverObject new user object: id={}\n", gem.id);
     Ok(ObjectRef::new(gem.into_ref()))
 }
 
@@ -159,14 +155,13 @@ impl gem::BaseDriverObject<Object> for DriverObject {
         try_pin_init!(DriverObject {
             kernel: false,
             flags: 0,
-            vm_id: None,
             id,
         })
     }
 
     /// Callback to drop all mappings for a GEM object owned by a given `File`
     fn close(obj: &Object, file: &DrmFile) {
-        mod_pr_debug!("DriverObject::close vm_id={:?} id={}\n", obj.vm_id, obj.id);
+        mod_pr_debug!("DriverObject::close id={}\n", obj.id);
         if file::File::unbind_gem_object(file, obj).is_err() {
             pr_err!("DriverObject::close: Failed to unbind GEM object\n");
         }

drivers/gpu/drm/asahi/mmu.rs

@@ -522,6 +522,7 @@ impl VmInner {
 pub(crate) struct Vm {
     id: u64,
     inner: ARef<gpuvm::GpuVm<VmInner>>,
+    dummy_obj: drm::gem::ObjectRef<gem::Object>,
     binding: Arc<Mutex<VmBinding>>,
 }
 no_debug!(Vm);
@@ -1048,6 +1049,7 @@ impl Vm {
         let binding_clone = binding.clone();
         Ok(Vm {
             id,
+            dummy_obj: dummy_obj.gem.clone(),
             inner: gpuvm::GpuVm::new(
                 c_str!("Asahi::GpuVm"),
                 dev,
@@ -1294,9 +1296,14 @@ impl Vm {
         Ok(())
     }
 
-    /// Returns the unique ID of this Vm
-    pub(crate) fn id(&self) -> u64 {
-        self.id
+    /// Returns the dummy GEM object used to hold the shared DMA reservation locks
+    pub(crate) fn get_resv_obj(&self) -> drm::gem::ObjectRef<gem::Object> {
+        self.dummy_obj.clone()
+    }
+
+    /// Check whether an object is external to this GpuVm
+    pub(crate) fn is_extobj(&self, gem: &gem::Object) -> bool {
+        self.inner.is_extobj(gem)
     }
 }