diff options
| author | markj <markj@FreeBSD.org> | 2017-09-28 15:18:20 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2017-09-28 15:18:20 +0000 |
| commit | 7df721e85e27fabc9fb5ceb121fcff0f05a8c6c4 (patch) | |
| tree | 17b0b62f880f91165a22fef14fabd7e41c714099 | |
| parent | 15cab1dc589f90df756808a01e50e493b17051e5 (diff) | |
| download | FreeBSD-src-7df721e85e27fabc9fb5ceb121fcff0f05a8c6c4.zip FreeBSD-src-7df721e85e27fabc9fb5ceb121fcff0f05a8c6c4.tar.gz | |
MFC r323880:
Simplify i915_gem_wire_page() and avoid unneeded page-busying.
| -rw-r--r-- | sys/dev/drm2/i915/i915_gem.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/dev/drm2/i915/i915_gem.c b/sys/dev/drm2/i915/i915_gem.c index 0fa5249..7502b61 100644 --- a/sys/dev/drm2/i915/i915_gem.c +++ b/sys/dev/drm2/i915/i915_gem.c @@ -4736,12 +4736,15 @@ i915_gem_wire_page(vm_object_t object, vm_pindex_t pindex, bool *fresh) int rv; VM_OBJECT_ASSERT_WLOCKED(object); - page = vm_page_grab(object, pindex, VM_ALLOC_NORMAL); + page = vm_page_grab(object, pindex, VM_ALLOC_NORMAL | VM_ALLOC_NOBUSY | + VM_ALLOC_WIRED); if (page->valid != VM_PAGE_BITS_ALL) { + vm_page_xbusy(page); if (vm_pager_has_page(object, pindex, NULL, NULL)) { rv = vm_pager_get_pages(object, &page, 1, NULL, NULL); if (rv != VM_PAGER_OK) { vm_page_lock(page); + vm_page_unwire(page, PQ_NONE); vm_page_free(page); vm_page_unlock(page); return (NULL); @@ -4755,13 +4758,9 @@ i915_gem_wire_page(vm_object_t object, vm_pindex_t pindex, bool *fresh) if (fresh != NULL) *fresh = false; } - } else if (fresh != NULL) { + vm_page_xunbusy(page); + } else if (fresh != NULL) *fresh = false; - } - vm_page_lock(page); - vm_page_wire(page); - vm_page_unlock(page); - vm_page_xunbusy(page); atomic_add_long(&i915_gem_wired_pages_cnt, 1); return (page); } |
