diff options
Diffstat (limited to 'sys/dev/drm2/ttm/ttm_tt.c')
| -rw-r--r-- | sys/dev/drm2/ttm/ttm_tt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/drm2/ttm/ttm_tt.c b/sys/dev/drm2/ttm/ttm_tt.c index 35c22df..c0fbb93 100644 --- a/sys/dev/drm2/ttm/ttm_tt.c +++ b/sys/dev/drm2/ttm/ttm_tt.c @@ -288,8 +288,10 @@ int ttm_tt_swapin(struct ttm_tt *ttm) VM_OBJECT_WLOCK(obj); vm_object_pip_add(obj, 1); for (i = 0; i < ttm->num_pages; ++i) { - from_page = vm_page_grab(obj, i, VM_ALLOC_RETRY); + from_page = vm_page_grab(obj, i, VM_ALLOC_NOBUSY | + VM_ALLOC_RETRY); if (from_page->valid != VM_PAGE_BITS_ALL) { + vm_page_busy(from_page); if (vm_pager_has_page(obj, i, NULL, NULL)) { rv = vm_pager_get_pages(obj, &from_page, 1, 0); if (rv != VM_PAGER_OK) { @@ -301,15 +303,14 @@ int ttm_tt_swapin(struct ttm_tt *ttm) } } else vm_page_zero_invalid(from_page, TRUE); + vm_page_wakeup(from_page); } to_page = ttm->pages[i]; if (unlikely(to_page == NULL)) { - vm_page_wakeup(from_page); ret = -ENOMEM; goto err_ret; } pmap_copy_page(from_page, to_page); - vm_page_wakeup(from_page); } vm_object_pip_wakeup(obj); VM_OBJECT_WUNLOCK(obj); |
