Skip to content

Commit d20a969

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

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
@@ -231,8 +231,6 @@ struct StepContext {
231231
prev_va: Option<Pin<KBox<gpuvm::GpuVa<VmInner>>>>,
232232
next_va: Option<Pin<KBox<gpuvm::GpuVa<VmInner>>>>,
233233
vm_bo: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
234-
prev_vm_bo_1: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
235-
prev_vm_bo_2: Option<ARef<gpuvm::GpuVmBo<VmInner>>>,
236234
prot: u32,
237235
}
238236

@@ -414,17 +412,6 @@ impl gpuvm::DriverGpuVm for VmInner {
414412
}
415413
}
416414

417-
if ctx.prev_vm_bo_1.is_none() {
418-
assert!(ctx.prev_vm_bo_1.replace(vm_bo).is_none());
419-
} else if ctx.prev_vm_bo_2.is_none() {
420-
assert!(ctx.prev_vm_bo_2.replace(vm_bo).is_none());
421-
} else {
422-
dev_crit!(
423-
self.dev.as_ref(),
424-
"step_remap: too many remap ops, deadlock expected"
425-
);
426-
}
427-
428415
Ok(())
429416
}
430417
}

0 commit comments

Comments
 (0)