diff options
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; |