From 16c7468461de2fb4c1ced4553958b5481aba067e Mon Sep 17 00:00:00 2001 From: mpi Date: Sun, 5 Sep 2021 07:59:47 +0000 Subject: [PATCH] Pass `uobj' to uvmfault_unlockall() at the end of the fault handler. This is currently a NOOP but will become necessary to unlock the UVM object with the upcoing "vmobjlock" diff. Tested by patrick@ and robert@ ok jsg@ --- sys/dev/pci/drm/ttm/ttm_bo_vm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/drm/ttm/ttm_bo_vm.c b/sys/dev/pci/drm/ttm/ttm_bo_vm.c index cd70004f7b3..a2d27de6e3d 100644 --- a/sys/dev/pci/drm/ttm/ttm_bo_vm.c +++ b/sys/dev/pci/drm/ttm/ttm_bo_vm.c @@ -711,7 +711,7 @@ ttm_bo_vm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps, break; } - uvmfault_unlockall(ufi, NULL, NULL); + uvmfault_unlockall(ufi, NULL, uobj); return ret; } @@ -730,7 +730,7 @@ ttm_bo_vm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps, dma_resv_unlock(bo->base.resv); - uvmfault_unlockall(ufi, NULL, NULL); + uvmfault_unlockall(ufi, NULL, uobj); return ret; } EXPORT_SYMBOL(ttm_bo_vm_fault); -- 2.20.1