summaryrefslogtreecommitdiff
path: root/drm/nouveau_ttm.c
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2014-07-16 17:42:06 +0900
committerAlexandre Courbot <acourbot@nvidia.com>2014-08-27 16:42:29 -0700
commit62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45 (patch)
tree726606bfbfb12a4fb0a20d7409bfd63964e50c66 /drm/nouveau_ttm.c
parent46725edf1c286abfe063dfacdeccbf498d0be60f (diff)
downloadnouveau-62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45.tar.gz
Experiments with large pagesbaserock/jetson/3.17-rc5
Diffstat (limited to 'drm/nouveau_ttm.c')
-rw-r--r--drm/nouveau_ttm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/nouveau_ttm.c b/drm/nouveau_ttm.c
index 53874b76b..2298c7b08 100644
--- a/drm/nouveau_ttm.c
+++ b/drm/nouveau_ttm.c
@@ -93,7 +93,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;