diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2014-07-16 17:42:06 +0900 |
---|---|---|
committer | Alexandre Courbot <acourbot@nvidia.com> | 2014-11-04 11:30:55 +0900 |
commit | fccca859a42540e08ea40941e4e99b8adb774bf6 (patch) | |
tree | 77b74642388874e49945f2c1e7d93bd11fdaf09d /drm | |
parent | e51342b86a94c6d2f49a1d0e81440ad9081f2d4b (diff) | |
download | nouveau-gk20a_new.tar.gz |
Experiments with large pagesgk20a_new
Diffstat (limited to 'drm')
-rw-r--r-- | drm/nouveau_sgdma.c | 1 | ||||
-rw-r--r-- | drm/nouveau_ttm.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drm/nouveau_sgdma.c b/drm/nouveau_sgdma.c index 01707e7de..3274eda02 100644 --- a/drm/nouveau_sgdma.c +++ b/drm/nouveau_sgdma.c @@ -38,6 +38,7 @@ nv04_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem) node->pages = nvbe->ttm.dma_address; } node->size = (mem->num_pages << PAGE_SHIFT) >> 12; + node->page_shift = PAGE_SHIFT; nouveau_vm_map(&node->vma[0], node); nvbe->node = node; diff --git a/drm/nouveau_ttm.c b/drm/nouveau_ttm.c index 753a6def6..2c51aaab0 100644 --- a/drm/nouveau_ttm.c +++ b/drm/nouveau_ttm.c @@ -92,7 +92,8 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man, return (ret == -ENOSPC) ? 0 : ret; } - node->page_shift = nvbo->page_shift; + if (!node->page_shift) + node->page_shift = nvbo->page_shift; mem->mm_node = node; mem->start = node->offset >> PAGE_SHIFT; |