Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/ttm: add page order support in ttm_pages_put 



Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarRoger He <Hongbo.He@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 54ddc5f2

drivers/gpu/drm/ttm/ttm_page_alloc.c

+18 −8
Original line number Diff line number Diff line
@@ -296,13 +296,23 @@ static struct ttm_page_pool *ttm_get_pool(int flags, bool huge, 
}



/* set memory back to wb and free the pages. */

static void ttm_pages_put(struct page *pages[], unsigned npages)

static void ttm_pages_put(struct page *pages[], unsigned npages,

		unsigned int order)

{

	unsigned i;

	unsigned int i, pages_nr = (1 << order);



	if (order == 0) {

		if (set_pages_array_wb(pages, npages))

			pr_err("Failed to set %d pages to wb!\n", npages);

	for (i = 0; i < npages; ++i)

		__free_page(pages[i]);

	}



	for (i = 0; i < npages; ++i) {

		if (order > 0) {

			if (set_pages_wb(pages[i], pages_nr))

				pr_err("Failed to set %d pages to wb!\n", pages_nr);

		}

		__free_pages(pages[i], order);

	}

}



static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
@@ -365,7 +375,7 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free, 
			 */

			spin_unlock_irqrestore(&pool->lock, irq_flags);



			ttm_pages_put(pages_to_free, freed_pages);

			ttm_pages_put(pages_to_free, freed_pages, pool->order);

			if (likely(nr_free != FREE_ALL_PAGES))

				nr_free -= freed_pages;
@@ -400,7 +410,7 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free, 
	spin_unlock_irqrestore(&pool->lock, irq_flags);



	if (freed_pages)

		ttm_pages_put(pages_to_free, freed_pages);

		ttm_pages_put(pages_to_free, freed_pages, pool->order);

out:

	if (pages_to_free != static_buf)

		kfree(pages_to_free);