Merge tag 'nfsd-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

[linux.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 80dd1343594c708ad8b68d54535092892dd6c6ee..faa12146635cf1dc8c864bcd4a4ea56826bfe96a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -439,7 +439,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
                /* Allocate blocks in desired range */
                vres->flags |= DRM_BUDDY_RANGE_ALLOCATION;
 
-       remaining_size = (u64)vres->base.num_pages << PAGE_SHIFT;
+       remaining_size = (u64)vres->base.size;
 
        mutex_lock(&mgr->lock);
        while (remaining_size) {
@@ -498,7 +498,7 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
                LIST_HEAD(temp);
 
                trim_list = &vres->blocks;
-               original_size = (u64)vres->base.num_pages << PAGE_SHIFT;
+               original_size = (u64)vres->base.size;
 
                /*
                 * If size value is rounded up to min_block_size, trim the last
@@ -533,8 +533,8 @@ static int amdgpu_vram_mgr_new(struct ttm_resource_manager *man,
                        amdgpu_vram_mgr_block_size(block);
                start >>= PAGE_SHIFT;
 
-               if (start > vres->base.num_pages)
-                       start -= vres->base.num_pages;
+               if (start > PFN_UP(vres->base.size))
+                       start -= PFN_UP(vres->base.size);
                else
                        start = 0;
                vres->base.start = max(vres->base.start, start);