diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2019-09-09 21:32:42 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2019-09-09 21:32:42 +0000 |
| commit | fee2a2fa39834d8d5eaa981298fce9d2ed31546d (patch) | |
| tree | 290b84257a055cb0fbd4eb498ca16690ad749aa3 /sys/dev/agp | |
| parent | 58a11be1cf32a2ad832d7167bd41819cb105851e (diff) | |
Notes
Diffstat (limited to 'sys/dev/agp')
| -rw-r--r-- | sys/dev/agp/agp.c | 6 | ||||
| -rw-r--r-- | sys/dev/agp/agp_i810.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 011c89afeb37..62664e8dfe87 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -616,9 +616,7 @@ bad: m = vm_page_lookup(mem->am_obj, OFF_TO_IDX(k)); if (k >= i) vm_page_xunbusy(m); - vm_page_lock(m); vm_page_unwire(m, PQ_INACTIVE); - vm_page_unlock(m); } VM_OBJECT_WUNLOCK(mem->am_obj); @@ -653,9 +651,7 @@ agp_generic_unbind_memory(device_t dev, struct agp_memory *mem) VM_OBJECT_WLOCK(mem->am_obj); for (i = 0; i < mem->am_size; i += PAGE_SIZE) { m = vm_page_lookup(mem->am_obj, atop(i)); - vm_page_lock(m); vm_page_unwire(m, PQ_INACTIVE); - vm_page_unlock(m); } VM_OBJECT_WUNLOCK(mem->am_obj); @@ -1003,7 +999,7 @@ agp_bind_pages(device_t dev, vm_page_t *pages, vm_size_t size, mtx_lock(&sc->as_lock); for (i = 0; i < size; i += PAGE_SIZE) { m = pages[OFF_TO_IDX(i)]; - KASSERT(m->wire_count > 0, + KASSERT(vm_page_wired(m), ("agp_bind_pages: page %p hasn't been wired", m)); /* diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index 27d7f1114a08..501f78ca0a32 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -1795,9 +1795,7 @@ agp_i810_free_memory(device_t dev, struct agp_memory *mem) */ VM_OBJECT_WLOCK(mem->am_obj); m = vm_page_lookup(mem->am_obj, 0); - vm_page_lock(m); vm_page_unwire(m, PQ_INACTIVE); - vm_page_unlock(m); VM_OBJECT_WUNLOCK(mem->am_obj); } else { contigfree(sc->argb_cursor, mem->am_size, M_AGP); |