Commit 58aa6622 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/ttm: Correctly set page mapping and -index members 



Needed for some vm operations; most notably unmap_mapping_range() with
even_cows = 0.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
parent 667a50db

drivers/gpu/drm/ttm/ttm_bo_vm.c

+5 −0
Original line number Diff line number Diff line
@@ -226,6 +226,9 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
			} else if (unlikely(!page)) {

				break;

			}

			page->mapping = vma->vm_file->f_mapping;

			page->index = drm_vma_node_start(&bo->vma_node) +

				page_offset;

			pfn = page_to_pfn(page);

		}
@@ -263,6 +266,8 @@ static void ttm_bo_vm_open(struct vm_area_struct *vma) 
	struct ttm_buffer_object *bo =

	    (struct ttm_buffer_object *)vma->vm_private_data;



	WARN_ON(bo->bdev->dev_mapping != vma->vm_file->f_mapping);



	(void)ttm_bo_reference(bo);

}

drivers/gpu/drm/ttm/ttm_tt.c

+23 −4
Original line number Diff line number Diff line
@@ -170,9 +170,8 @@ void ttm_tt_destroy(struct ttm_tt *ttm) 
		ttm_tt_unbind(ttm);

	}



	if (ttm->state == tt_unbound) {

		ttm->bdev->driver->ttm_tt_unpopulate(ttm);

	}

	if (ttm->state == tt_unbound)

		ttm_tt_unpopulate(ttm);



	if (!(ttm->page_flags & TTM_PAGE_FLAG_PERSISTENT_SWAP) &&

	    ttm->swap_storage)
@@ -362,7 +361,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) 
		page_cache_release(to_page);

	}



	ttm->bdev->driver->ttm_tt_unpopulate(ttm);

	ttm_tt_unpopulate(ttm);

	ttm->swap_storage = swap_storage;

	ttm->page_flags |= TTM_PAGE_FLAG_SWAPPED;

	if (persistent_swap_storage)
@@ -375,3 +374,23 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) 


	return ret;

}



static void ttm_tt_clear_mapping(struct ttm_tt *ttm)

{

	pgoff_t i;

	struct page **page = ttm->pages;



	for (i = 0; i < ttm->num_pages; ++i) {

		(*page)->mapping = NULL;

		(*page++)->index = 0;

	}

}



void ttm_tt_unpopulate(struct ttm_tt *ttm)

{

	if (ttm->state == tt_unpopulated)

		return;



	ttm_tt_clear_mapping(ttm);

	ttm->bdev->driver->ttm_tt_unpopulate(ttm);

}

include/drm/ttm/ttm_bo_driver.h

+9 −0
Original line number Diff line number Diff line
@@ -681,6 +681,15 @@ extern int ttm_tt_set_placement_caching(struct ttm_tt *ttm, uint32_t placement); 
extern int ttm_tt_swapout(struct ttm_tt *ttm,

			  struct file *persistent_swap_storage);



/**

 * ttm_tt_unpopulate - free pages from a ttm

 *

 * @ttm: Pointer to the ttm_tt structure

 *

 * Calls the driver method to free all pages from a ttm

 */

extern void ttm_tt_unpopulate(struct ttm_tt *ttm);



/*

 * ttm_bo.c

 */