Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vram_mgr.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index bce105e2973e8c7224fe582e7f5185fbb27d7ce2..f7235438535f5ac00bce0ee859ab96088598a39a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -450,7 +450,8 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
                /* default to 2MB */
                pages_per_node = (2UL << (20UL - PAGE_SHIFT));
 #endif
-               pages_per_node = max((uint32_t)pages_per_node, mem->page_alignment);
+               pages_per_node = max((uint32_t)pages_per_node,
+                                    tbo->page_alignment);
                num_nodes = DIV_ROUND_UP(mem->num_pages, pages_per_node);
        }
 
@@ -489,7 +490,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
 
        for (; pages_left; ++i) {
                unsigned long pages = min(pages_left, pages_per_node);
-               uint32_t alignment = mem->page_alignment;
+               uint32_t alignment = tbo->page_alignment;
 
                if (pages == pages_per_node)
                        alignment = pages_per_node;