Skip to content

Commit a5dd701

Browse files
hoshinolinajannau
authored andcommitted
drm/asahi: mmu: Change step_remap() to new api
Signed-off-by: Asahi Lina <lina@asahilina.net>
1 parent d9a216c commit a5dd701

1 file changed

Lines changed: 0 additions & 13 deletions

File tree

drivers/gpu/drm/asahi/mmu.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,6 @@ struct StepContext {
228228
prev_va: Option<Pin<KBox<gpuvm::GpuVa<VmInner>>>>,
229229
next_va: Option<Pin<KBox<gpuvm::GpuVa<VmInner>>>>,
230230
vm_bo: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
231-
prev_vm_bo_1: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
232-
prev_vm_bo_2: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
233231
prot: u32,
234232
}
235233

@@ -410,17 +408,6 @@ impl gpuvm::DriverGpuVm for VmInner {
410408
}
411409
}
412410

413-
if ctx.prev_vm_bo_1.is_none() {
414-
assert!(ctx.prev_vm_bo_1.replace(vm_bo).is_none());
415-
} else if ctx.prev_vm_bo_2.is_none() {
416-
assert!(ctx.prev_vm_bo_2.replace(vm_bo).is_none());
417-
} else {
418-
dev_crit!(
419-
self.dev.as_ref(),
420-
"step_remap: too many remap ops, deadlock expected"
421-
);
422-
}
423-
424411
Ok(())
425412
}
426413
}

0 commit comments

Comments
 (0)