Commit 9483ce7c authored by Roger He's avatar Roger He Committed by Alex Deucher
Browse files

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: default avatarRoger He <Hongbo.He@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 83fbb788

drivers/gpu/drm/ttm/ttm_page_alloc.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

		}

	}