mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-15 15:06:42 +00:00
Code Issues Releases Activity

Simplify i915_gem_wire_page() and avoid unneeded page-busying.

Browse Source 
Reviewed by:	alc, kib
MFC after:	1 week
This commit is contained in:
Mark Johnston 2017-09-21 22:15:45 +00:00
parent 326aacb0e3
commit 568aef2f6a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=323880
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/drm2/i915/i915_gem.c
View File

@ -4735,12 +4735,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);
@ -4754,13 +4757,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);
}