drm/amd/powerplay: no memory activity support on Vega10

[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 8abc9b6892ea9494f64d4aa49b780a54cbed30b7..3a9d8c15fe9fc732326c9f59aae0c68495235b14 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -275,7 +275,7 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
        struct drm_mm_node *nodes;
        enum drm_mm_insert_mode mode;
        unsigned long lpfn, num_nodes, pages_per_node, pages_left;
-       uint64_t usage = 0, vis_usage = 0;
+       uint64_t vis_usage = 0, mem_bytes;
        unsigned i;
        int r;
 
@@ -283,20 +283,34 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
        if (!lpfn)
                lpfn = man->size;
 
-       if (place->flags & TTM_PL_FLAG_CONTIGUOUS ||
-           amdgpu_vram_page_split == -1) {
+       /* bail out quickly if there's likely not enough VRAM for this BO */
+       mem_bytes = (u64)mem->num_pages << PAGE_SHIFT;
+       if (atomic64_add_return(mem_bytes, &mgr->usage) > adev->gmc.mc_vram_size) {
+               atomic64_sub(mem_bytes, &mgr->usage);
+               mem->mm_node = NULL;
+               return 0;
+       }
+
+       if (place->flags & TTM_PL_FLAG_CONTIGUOUS) {
                pages_per_node = ~0ul;
                num_nodes = 1;
        } else {
-               pages_per_node = max((uint32_t)amdgpu_vram_page_split,
-                                    mem->page_alignment);
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+               pages_per_node = HPAGE_PMD_NR;
+#else
+               /* default to 2MB */
+               pages_per_node = (2UL << (20UL - PAGE_SHIFT));
+#endif
+               pages_per_node = max((uint32_t)pages_per_node, mem->page_alignment);
                num_nodes = DIV_ROUND_UP(mem->num_pages, pages_per_node);
        }
 
-       nodes = kvmalloc_array(num_nodes, sizeof(*nodes),
+       nodes = kvmalloc_array((uint32_t)num_nodes, sizeof(*nodes),
                               GFP_KERNEL | __GFP_ZERO);
-       if (!nodes)
+       if (!nodes) {
+               atomic64_sub(mem_bytes, &mgr->usage);
                return -ENOMEM;
+       }
 
        mode = DRM_MM_INSERT_BEST;
        if (place->flags & TTM_PL_FLAG_TOPDOWN)
@@ -316,7 +330,6 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
                if (unlikely(r))
                        break;
 
-               usage += nodes[i].size << PAGE_SHIFT;
                vis_usage += amdgpu_vram_mgr_vis_size(adev, &nodes[i]);
                amdgpu_vram_mgr_virt_start(mem, &nodes[i]);
                pages_left -= pages;
@@ -336,14 +349,12 @@ static int amdgpu_vram_mgr_new(struct ttm_mem_type_manager *man,
                if (unlikely(r))
                        goto error;
 
-               usage += nodes[i].size << PAGE_SHIFT;
                vis_usage += amdgpu_vram_mgr_vis_size(adev, &nodes[i]);
                amdgpu_vram_mgr_virt_start(mem, &nodes[i]);
                pages_left -= pages;
        }
        spin_unlock(&mgr->lock);
 
-       atomic64_add(usage, &mgr->usage);
        atomic64_add(vis_usage, &mgr->vis_usage);
 
        mem->mm_node = nodes;
@@ -354,6 +365,7 @@ error:
        while (i--)
                drm_mm_remove_node(&nodes[i]);
        spin_unlock(&mgr->lock);
+       atomic64_sub(mem->num_pages << PAGE_SHIFT, &mgr->usage);
 
        kvfree(nodes);
        return r == -ENOSPC ? 0 : r;