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

Commit f9ebec52 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/ttm: remove unsued options from ttm_mem_global_alloc_page 



Nobody is actually using that, remove it.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 65da0d40

drivers/gpu/drm/ttm/ttm_memory.c

+2 −4
Original line number Diff line number Diff line
@@ -546,8 +546,7 @@ int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory, 
EXPORT_SYMBOL(ttm_mem_global_alloc);



int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,

			      struct page *page,

			      bool no_wait, bool interruptible)

			      struct page *page)

{



	struct ttm_mem_zone *zone = NULL;
@@ -564,8 +563,7 @@ int ttm_mem_global_alloc_page(struct ttm_mem_global *glob, 
	if (glob->zone_dma32 && page_to_pfn(page) > 0x00100000UL)

		zone = glob->zone_kernel;

#endif

	return ttm_mem_global_alloc_zone(glob, zone, PAGE_SIZE, no_wait,

					 interruptible);

	return ttm_mem_global_alloc_zone(glob, zone, PAGE_SIZE, false, false);

}



void ttm_mem_global_free_page(struct ttm_mem_global *glob, struct page *page)

drivers/gpu/drm/ttm/ttm_page_alloc.c

+1 −2
Original line number Diff line number Diff line
@@ -882,8 +882,7 @@ int ttm_pool_populate(struct ttm_tt *ttm) 
			return -ENOMEM;

		}



		ret = ttm_mem_global_alloc_page(mem_glob, ttm->pages[i],

						false, false);

		ret = ttm_mem_global_alloc_page(mem_glob, ttm->pages[i]);

		if (unlikely(ret != 0)) {

			ttm_pool_unpopulate(ttm);

			return -ENOMEM;

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

+1 −2
Original line number Diff line number Diff line
@@ -902,8 +902,7 @@ int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev) 
			return -ENOMEM;

		}



		ret = ttm_mem_global_alloc_page(mem_glob, ttm->pages[i],

						false, false);

		ret = ttm_mem_global_alloc_page(mem_glob, ttm->pages[i]);

		if (unlikely(ret != 0)) {

			ttm_dma_unpopulate(ttm_dma, dev);

			return -ENOMEM;

include/drm/ttm/ttm_memory.h

+1 −2
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ extern int ttm_mem_global_alloc(struct ttm_mem_global *glob, uint64_t memory, 
extern void ttm_mem_global_free(struct ttm_mem_global *glob,

				uint64_t amount);

extern int ttm_mem_global_alloc_page(struct ttm_mem_global *glob,

				     struct page *page,

				     bool no_wait, bool interruptible);

				     struct page *page);

extern void ttm_mem_global_free_page(struct ttm_mem_global *glob,

				     struct page *page);

extern size_t ttm_round_pot(size_t size);