drm/ttm: only free pages rather than update global memory count together

if ttm_get_pages or ttm_mem_global_alloc_page fail, should not update
global memory count.

Signed-off-by: Roger He <Hongbo.He@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Tested-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index e48e387d4d17..6288389e6959 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -1073,7 +1073,8 @@ int ttm_pool_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
         ret = ttm_get_pages(ttm->pages, ttm->num_pages, ttm->page_flags,
                             ttm->caching_state);
         if (unlikely(ret != 0)) {
-                ttm_pool_unpopulate(ttm);
+                ttm_put_pages(ttm->pages, ttm->num_pages, ttm->page_flags,
+                              ttm->caching_state);
                 return ret;
         }
 
@@ -1081,7 +1082,8 @@ int ttm_pool_populate(struct ttm_tt *ttm, struct ttm_operation_ctx *ctx)
                 ret = ttm_mem_global_alloc_page(mem_glob, ttm->pages[i],
                                                 PAGE_SIZE, ctx);
                 if (unlikely(ret != 0)) {
-                        ttm_pool_unpopulate(ttm);
+                        ttm_put_pages(ttm->pages, ttm->num_pages,
+                                      ttm->page_flags, ttm->caching_state);
                         return -ENOMEM;
                 }
         }