Skip to content

Commit 5cb57fb

Browse files
committed
fixup! drm/asahi: mmu: Fix 2x step_remap case
1 parent 6548df4 commit 5cb57fb

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

drivers/gpu/drm/asahi/mmu.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,15 +349,21 @@ impl gpuvm::DriverGpuVm for VmInner {
349349
}
350350

351351
if let Some(prev_op) = op.prev_map() {
352-
let prev_gpuva = ctx.prev_va.take().expect("Multiple step_remap calls with prev_op");
352+
let prev_gpuva = ctx
353+
.prev_va
354+
.take()
355+
.expect("Multiple step_remap calls with prev_op");
353356
if prev_op.map_and_link_va(self, prev_gpuva, &vm_bo).is_err() {
354357
dev_err!(self.dev.as_ref(), "step_remap: could not relink prev gpuva");
355358
return Err(EINVAL);
356359
}
357360
}
358361

359362
if let Some(next_op) = op.next_map() {
360-
let next_gpuva = ctx.next_va.take().expect("Multiple step_remap calls with next_op");
363+
let next_gpuva = ctx
364+
.next_va
365+
.take()
366+
.expect("Multiple step_remap calls with next_op");
361367
if next_op.map_and_link_va(self, next_gpuva, &vm_bo).is_err() {
362368
dev_err!(self.dev.as_ref(), "step_remap: could not relink next gpuva");
363369
return Err(EINVAL);

0 commit comments

Comments
 (0)