drm/asahi: mmu: Change step_remap() to new api

Signed-off-by: Asahi Lina <[email protected]>

Author: hoshinolina

drivers/gpu/drm/asahi/mmu.rs

@@ -228,8 +228,6 @@ struct StepContext {
     prev_va: Option<Pin<KBox<gpuvm::GpuVa<VmInner>>>>,
     next_va: Option<Pin<KBox<gpuvm::GpuVa<VmInner>>>>,
     vm_bo: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
-    prev_vm_bo_1: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
-    prev_vm_bo_2: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
     prot: u32,
 }
 
@@ -339,14 +337,14 @@ impl gpuvm::DriverGpuVm for VmInner {
     fn step_remap(
         self: &mut gpuvm::UpdatingGpuVm<'_, Self>,
         op: &mut gpuvm::OpReMap<Self>,
+        vm_bo: &gpuvm::GpuVmBo<Self>,
         ctx: &mut Self::StepContext,
     ) -> Result {
         let prev_gpuva = ctx.prev_va.take().expect("Multiple step_remap calls");
         let next_gpuva = ctx.next_va.take().expect("Multiple step_remap calls");
         let va = op.unmap().va().expect("No previous VA");
         let orig_addr = va.addr();
         let orig_range = va.range();
-        let vm_bo = va.vm_bo();
 
         // Only unmap the hole between prev/next, if they exist
         let unmap_start = if let Some(op) = op.prev_map() {
@@ -404,17 +402,6 @@ impl gpuvm::DriverGpuVm for VmInner {
             }
         }
 
-        if ctx.prev_vm_bo_1.is_none() {
-            assert!(ctx.prev_vm_bo_1.replace(vm_bo).is_none());
-        } else if ctx.prev_vm_bo_2.is_none() {
-            assert!(ctx.prev_vm_bo_2.replace(vm_bo).is_none());
-        } else {
-            dev_crit!(
-                self.dev.as_ref(),
-                "step_remap: too many remap ops, deadlock expected"
-            );
-        }
-
         Ok(())
     }
 }