Deleted Added
full compact
ttm_tt.c (247835) ttm_tt.c (248084)
1/**************************************************************************
2 *
3 * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
4 * All Rights Reserved.
5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the
8 * "Software"), to deal in the Software without restriction, including

--- 22 unchanged lines hidden (view full) ---

31 * Copyright (c) 2013 The FreeBSD Foundation
32 * All rights reserved.
33 *
34 * Portions of this software were developed by Konstantin Belousov
35 * <kib@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
36 */
37
38#include <sys/cdefs.h>
1/**************************************************************************
2 *
3 * Copyright (c) 2006-2009 VMware, Inc., Palo Alto, CA., USA
4 * All Rights Reserved.
5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the
8 * "Software"), to deal in the Software without restriction, including

--- 22 unchanged lines hidden (view full) ---

31 * Copyright (c) 2013 The FreeBSD Foundation
32 * All rights reserved.
33 *
34 * Portions of this software were developed by Konstantin Belousov
35 * <kib@FreeBSD.org> under sponsorship from the FreeBSD Foundation.
36 */
37
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/sys/dev/drm2/ttm/ttm_tt.c 247835 2013-03-05 09:49:34Z kib $");
39__FBSDID("$FreeBSD: head/sys/dev/drm2/ttm/ttm_tt.c 248084 2013-03-09 02:32:23Z attilio $");
40
41#include <dev/drm2/drmP.h>
42#include <dev/drm2/ttm/ttm_module.h>
43#include <dev/drm2/ttm/ttm_bo_driver.h>
44#include <dev/drm2/ttm/ttm_placement.h>
45#include <dev/drm2/ttm/ttm_page_alloc.h>
46
47MALLOC_DEFINE(M_TTM_PD, "ttm_pd", "TTM Page Directories");

--- 232 unchanged lines hidden (view full) ---

280int ttm_tt_swapin(struct ttm_tt *ttm)
281{
282 vm_object_t obj;
283 vm_page_t from_page, to_page;
284 int i, ret, rv;
285
286 obj = ttm->swap_storage;
287
40
41#include <dev/drm2/drmP.h>
42#include <dev/drm2/ttm/ttm_module.h>
43#include <dev/drm2/ttm/ttm_bo_driver.h>
44#include <dev/drm2/ttm/ttm_placement.h>
45#include <dev/drm2/ttm/ttm_page_alloc.h>
46
47MALLOC_DEFINE(M_TTM_PD, "ttm_pd", "TTM Page Directories");

--- 232 unchanged lines hidden (view full) ---

280int ttm_tt_swapin(struct ttm_tt *ttm)
281{
282 vm_object_t obj;
283 vm_page_t from_page, to_page;
284 int i, ret, rv;
285
286 obj = ttm->swap_storage;
287
288 VM_OBJECT_LOCK(obj);
288 VM_OBJECT_WLOCK(obj);
289 vm_object_pip_add(obj, 1);
290 for (i = 0; i < ttm->num_pages; ++i) {
291 from_page = vm_page_grab(obj, i, VM_ALLOC_RETRY);
292 if (from_page->valid != VM_PAGE_BITS_ALL) {
293 if (vm_pager_has_page(obj, i, NULL, NULL)) {
294 rv = vm_pager_get_pages(obj, &from_page, 1, 0);
295 if (rv != VM_PAGER_OK) {
296 vm_page_lock(from_page);

--- 10 unchanged lines hidden (view full) ---

307 vm_page_wakeup(from_page);
308 ret = -ENOMEM;
309 goto err_ret;
310 }
311 pmap_copy_page(from_page, to_page);
312 vm_page_wakeup(from_page);
313 }
314 vm_object_pip_wakeup(obj);
289 vm_object_pip_add(obj, 1);
290 for (i = 0; i < ttm->num_pages; ++i) {
291 from_page = vm_page_grab(obj, i, VM_ALLOC_RETRY);
292 if (from_page->valid != VM_PAGE_BITS_ALL) {
293 if (vm_pager_has_page(obj, i, NULL, NULL)) {
294 rv = vm_pager_get_pages(obj, &from_page, 1, 0);
295 if (rv != VM_PAGER_OK) {
296 vm_page_lock(from_page);

--- 10 unchanged lines hidden (view full) ---

307 vm_page_wakeup(from_page);
308 ret = -ENOMEM;
309 goto err_ret;
310 }
311 pmap_copy_page(from_page, to_page);
312 vm_page_wakeup(from_page);
313 }
314 vm_object_pip_wakeup(obj);
315 VM_OBJECT_UNLOCK(obj);
315 VM_OBJECT_WUNLOCK(obj);
316
317 if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP))
318 vm_object_deallocate(obj);
319 ttm->swap_storage = NULL;
320 ttm->page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
321 return (0);
322
323err_ret:
324 vm_object_pip_wakeup(obj);
316
317 if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP))
318 vm_object_deallocate(obj);
319 ttm->swap_storage = NULL;
320 ttm->page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
321 return (0);
322
323err_ret:
324 vm_object_pip_wakeup(obj);
325 VM_OBJECT_UNLOCK(obj);
325 VM_OBJECT_WUNLOCK(obj);
326 return (ret);
327}
328
329int ttm_tt_swapout(struct ttm_tt *ttm, vm_object_t persistent_swap_storage)
330{
331 vm_object_t obj;
332 vm_page_t from_page, to_page;
333 int i;

--- 7 unchanged lines hidden (view full) ---

341 curthread->td_ucred);
342 if (obj == NULL) {
343 printf("[TTM] Failed allocating swap storage\n");
344 return (-ENOMEM);
345 }
346 } else
347 obj = persistent_swap_storage;
348
326 return (ret);
327}
328
329int ttm_tt_swapout(struct ttm_tt *ttm, vm_object_t persistent_swap_storage)
330{
331 vm_object_t obj;
332 vm_page_t from_page, to_page;
333 int i;

--- 7 unchanged lines hidden (view full) ---

341 curthread->td_ucred);
342 if (obj == NULL) {
343 printf("[TTM] Failed allocating swap storage\n");
344 return (-ENOMEM);
345 }
346 } else
347 obj = persistent_swap_storage;
348
349 VM_OBJECT_LOCK(obj);
349 VM_OBJECT_WLOCK(obj);
350 vm_object_pip_add(obj, 1);
351 for (i = 0; i < ttm->num_pages; ++i) {
352 from_page = ttm->pages[i];
353 if (unlikely(from_page == NULL))
354 continue;
355 to_page = vm_page_grab(obj, i, VM_ALLOC_RETRY);
356 pmap_copy_page(from_page, to_page);
357 vm_page_dirty(to_page);
358 to_page->valid = VM_PAGE_BITS_ALL;
359 vm_page_wakeup(to_page);
360 }
361 vm_object_pip_wakeup(obj);
350 vm_object_pip_add(obj, 1);
351 for (i = 0; i < ttm->num_pages; ++i) {
352 from_page = ttm->pages[i];
353 if (unlikely(from_page == NULL))
354 continue;
355 to_page = vm_page_grab(obj, i, VM_ALLOC_RETRY);
356 pmap_copy_page(from_page, to_page);
357 vm_page_dirty(to_page);
358 to_page->valid = VM_PAGE_BITS_ALL;
359 vm_page_wakeup(to_page);
360 }
361 vm_object_pip_wakeup(obj);
362 VM_OBJECT_UNLOCK(obj);
362 VM_OBJECT_WUNLOCK(obj);
363
364 ttm->bdev->driver->ttm_tt_unpopulate(ttm);
365 ttm->swap_storage = obj;
366 ttm->page_flags |= TTM_PAGE_FLAG_SWAPPED;
367 if (persistent_swap_storage != NULL)
368 ttm->page_flags |= TTM_PAGE_FLAG_PERSISTENT_SWAP;
369 return (0);
370}
363
364 ttm->bdev->driver->ttm_tt_unpopulate(ttm);
365 ttm->swap_storage = obj;
366 ttm->page_flags |= TTM_PAGE_FLAG_SWAPPED;
367 if (persistent_swap_storage != NULL)
368 ttm->page_flags |= TTM_PAGE_FLAG_PERSISTENT_SWAP;
369 return (0);
370}