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

[linux-block.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 f78d21910e07992dc6e7bd7e58473a98be6d5cbc..0f897a34307347411dbad1cac5022f43954a262f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -29,6 +29,11 @@
 #include "amdgpu_atomfirmware.h"
 #include "atom.h"
 
+struct amdgpu_vram_reservation {
+       struct list_head node;
+       struct drm_mm_node mm_node;
+};
+
 static inline struct amdgpu_vram_mgr *
 to_vram_mgr(struct ttm_resource_manager *man)
 {
@@ -446,10 +451,11 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
        }
        spin_unlock(&mgr->lock);
 
-       atomic64_add(vis_usage, &mgr->vis_usage);
+       if (i == 1)
+               mem->placement |= TTM_PL_FLAG_CONTIGUOUS;
 
+       atomic64_add(vis_usage, &mgr->vis_usage);
        mem->mm_node = nodes;
-
        return 0;
 
 error: