Merge tag 'amd-drm-next-5.14-2021-05-21' of https://gitlab.freedesktop.org/agd5f...

[platform/kernel/linux-starfive.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 a52e17e..0f897a3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -399,7 +399,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
                pages_per_node = 2UL << (20UL - PAGE_SHIFT);
 #endif
                pages_per_node = max_t(uint32_t, pages_per_node,
-                                      mem->page_alignment);
+                                      tbo->page_alignment);
                num_nodes = DIV_ROUND_UP(mem->num_pages, pages_per_node);
        }
 
@@ -423,7 +423,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
        i = 0;
        spin_lock(&mgr->lock);
        while (pages_left) {
-               uint32_t alignment = mem->page_alignment;
+               uint32_t alignment = tbo->page_alignment;
 
                if (pages >= pages_per_node)
                        alignment = pages_per_node;