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

[linux-2.6-block.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gtt_mgr.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 540c01052b219a73e1ff70f067396eb3772cfe9b..72962de4c04ca05ddaf9bbefa8594903d0103661 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -205,7 +205,7 @@ static int amdgpu_gtt_mgr_new(struct ttm_resource_manager *man,
 
        spin_lock(&mgr->lock);
        r = drm_mm_insert_node_in_range(&mgr->mm, &node->node, mem->num_pages,
-                                       mem->page_alignment, 0, place->fpfn,
+                                       tbo->page_alignment, 0, place->fpfn,
                                        place->lpfn, DRM_MM_INSERT_BEST);
        spin_unlock(&mgr->lock);