summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2020-11-06 11:52:40 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2020-11-06 11:52:40 +0000
commit582511428c84c67209fdc076be8b5be49c83bc11 (patch)
tree176c6c1d4f612ed9fa23ca3aac8b40a48b276cbc /sys/dev/pci/drm
parent9fe867ef7e5b79dfbf6055572ffe97db26fe00d5 (diff)
Remove unused `anon' argument from uvmfault_unlockall().
It won't be used when amap and anon locking will be introduced. This "fixes" passing a unrelated/uninitialized pointer in an error path in case of memory shortage. ok kettenis@
Diffstat (limited to 'sys/dev/pci/drm')
-rw-r--r--sys/dev/pci/drm/drm_gem.c4
-rw-r--r--sys/dev/pci/drm/i915/gem/i915_gem_mman.c10
-rw-r--r--sys/dev/pci/drm/ttm/ttm_bo_vm.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/pci/drm/drm_gem.c b/sys/dev/pci/drm/drm_gem.c
index 729b9e921ed..2978ddab923 100644
--- a/sys/dev/pci/drm/drm_gem.c
+++ b/sys/dev/pci/drm/drm_gem.c
@@ -101,7 +101,7 @@ drm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps,
*/
if (UVM_ET_ISCOPYONWRITE(entry)) {
- uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj, NULL);
+ uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
return(VM_PAGER_ERROR);
}
@@ -115,7 +115,7 @@ drm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps,
mtx_enter(&dev->quiesce_mtx);
if (dev->quiesce && dev->quiesce_count == 0) {
mtx_leave(&dev->quiesce_mtx);
- uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj, NULL);
+ uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
mtx_enter(&dev->quiesce_mtx);
while (dev->quiesce) {
msleep_nsec(&dev->quiesce, &dev->quiesce_mtx,
diff --git a/sys/dev/pci/drm/i915/gem/i915_gem_mman.c b/sys/dev/pci/drm/i915/gem/i915_gem_mman.c
index 23423395aa2..351826ce132 100644
--- a/sys/dev/pci/drm/i915/gem/i915_gem_mman.c
+++ b/sys/dev/pci/drm/i915/gem/i915_gem_mman.c
@@ -473,7 +473,7 @@ vm_fault_cpu(struct i915_mmap_offset *mmo, struct uvm_faultinfo *ufi,
/* Sanity check that we allow writing into this object */
if (unlikely(i915_gem_object_is_readonly(obj) && write)) {
- uvmfault_unlockall(ufi, NULL, &obj->base.uobj, NULL);
+ uvmfault_unlockall(ufi, NULL, &obj->base.uobj);
return VM_PAGER_BAD;
}
@@ -518,7 +518,7 @@ vm_fault_cpu(struct i915_mmap_offset *mmo, struct uvm_faultinfo *ufi,
i915_gem_object_unpin_pages(obj);
out:
- uvmfault_unlockall(ufi, NULL, &obj->base.uobj, NULL);
+ uvmfault_unlockall(ufi, NULL, &obj->base.uobj);
return i915_error_to_vmf_fault(err);
}
@@ -559,7 +559,7 @@ vm_fault_gtt(struct i915_mmap_offset *mmo, struct uvm_faultinfo *ufi,
/* Sanity check that we allow writing into this object */
if (i915_gem_object_is_readonly(obj) && write) {
- uvmfault_unlockall(ufi, NULL, &obj->base.uobj, NULL);
+ uvmfault_unlockall(ufi, NULL, &obj->base.uobj);
return VM_PAGER_BAD;
}
@@ -664,7 +664,7 @@ err_rpm:
intel_runtime_pm_put(rpm, wakeref);
i915_gem_object_unpin_pages(obj);
err:
- uvmfault_unlockall(ufi, NULL, &obj->base.uobj, NULL);
+ uvmfault_unlockall(ufi, NULL, &obj->base.uobj);
return i915_error_to_vmf_fault(ret);
}
@@ -687,7 +687,7 @@ i915_gem_fault(struct drm_gem_object *gem_obj, struct uvm_faultinfo *ufi,
mmo = container_of(node, struct i915_mmap_offset, vma_node);
drm_vma_offset_unlock_lookup(dev->vma_offset_manager);
if (!mmo) {
- uvmfault_unlockall(ufi, NULL, &gem_obj->uobj, NULL);
+ uvmfault_unlockall(ufi, NULL, &gem_obj->uobj);
return VM_PAGER_BAD;
}
diff --git a/sys/dev/pci/drm/ttm/ttm_bo_vm.c b/sys/dev/pci/drm/ttm/ttm_bo_vm.c
index 6a941ea635e..cb08d893a5d 100644
--- a/sys/dev/pci/drm/ttm/ttm_bo_vm.c
+++ b/sys/dev/pci/drm/ttm/ttm_bo_vm.c
@@ -750,7 +750,7 @@ ttm_bo_vm_fault(struct uvm_faultinfo *ufi, vaddr_t vaddr, vm_page_t *pps,
break;
}
- uvmfault_unlockall(ufi, NULL, NULL, NULL);
+ uvmfault_unlockall(ufi, NULL, NULL);
return ret;
}
@@ -769,7 +769,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, NULL);
+ uvmfault_unlockall(ufi, NULL, NULL);
return ret;
}
EXPORT_SYMBOL(ttm_bo_vm_fault);