svn commit: r323880 - head/sys/dev/drm2/i915
Mark Johnston
markj at FreeBSD.org
Thu Sep 21 22:15:46 UTC 2017
Author: markj
Date: Thu Sep 21 22:15:45 2017
New Revision: 323880
URL: https://svnweb.freebsd.org/changeset/base/323880
Log:
Simplify i915_gem_wire_page() and avoid unneeded page-busying.
Reviewed by: alc, kib
MFC after: 1 week
Modified:
head/sys/dev/drm2/i915/i915_gem.c
Modified: head/sys/dev/drm2/i915/i915_gem.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_gem.c Thu Sep 21 21:14:48 2017 (r323879)
+++ head/sys/dev/drm2/i915/i915_gem.c Thu Sep 21 22:15:45 2017 (r323880)
@@ -4735,12 +4735,15 @@ i915_gem_wire_page(vm_object_t object, vm_pindex_t pin
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);
@@ -4754,13 +4757,9 @@ i915_gem_wire_page(vm_object_t object, vm_pindex_t pin
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);
}
More information about the svn-src-all
mailing list