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

Commit a4dec819 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/ttm: Add helper functions to populate/map in one call (v2) 



These functions replace a section of common code found
in radeon/amdgpu drivers (and possibly others) as part
of the ttm_tt_*populate() callbacks.

v2: squash in fix for sw iommu from Tom

Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e719d516

drivers/gpu/drm/ttm/ttm_page_alloc.c

+41 −0
Original line number Diff line number Diff line
@@ -920,6 +920,47 @@ void ttm_pool_unpopulate(struct ttm_tt *ttm) 
}

EXPORT_SYMBOL(ttm_pool_unpopulate);



int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt)

{

	unsigned i;

	int r;



	r = ttm_pool_populate(&tt->ttm);

	if (r)

		return r;



	for (i = 0; i < tt->ttm.num_pages; i++) {

		tt->dma_address[i] = dma_map_page(dev, tt->ttm.pages[i],

						  0, PAGE_SIZE,

						  DMA_BIDIRECTIONAL);

		if (dma_mapping_error(dev, tt->dma_address[i])) {

			while (i--) {

				dma_unmap_page(dev, tt->dma_address[i],

					       PAGE_SIZE, DMA_BIDIRECTIONAL);

				tt->dma_address[i] = 0;

			}

			ttm_pool_unpopulate(&tt->ttm);

			return -EFAULT;

		}

	}

	return 0;

}

EXPORT_SYMBOL(ttm_populate_and_map_pages);



void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt)

{

	unsigned i;

	

	for (i = 0; i < tt->ttm.num_pages; i++) {

		if (tt->dma_address[i]) {

			dma_unmap_page(dev, tt->dma_address[i],

				       PAGE_SIZE, DMA_BIDIRECTIONAL);

		}

	}

	ttm_pool_unpopulate(&tt->ttm);

}

EXPORT_SYMBOL(ttm_unmap_and_unpopulate_pages);



int ttm_page_alloc_debugfs(struct seq_file *m, void *data)

{

	struct ttm_page_pool *p;

include/drm/ttm/ttm_page_alloc.h

+21 −0
Original line number Diff line number Diff line
@@ -83,6 +83,17 @@ extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data); 
extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);

extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);





/**

 * Populates and DMA maps pages to fullfil a ttm_dma_populate() request

 */

int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt);



/**

 * Unpopulates and DMA unmaps pages as part of a

 * ttm_dma_unpopulate() request */

void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt);



#else

static inline int ttm_dma_page_alloc_init(struct ttm_mem_global *glob,

					  unsigned max_pages)
@@ -105,6 +116,16 @@ static inline void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, 
				      struct device *dev)

{

}



static inline int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt)

{

	return -ENOMEM;

}



static inline void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt)

{

}



#endif



#endif