drm/ttm: Add helper functions to populate/map in one call
Subsystems (3)
PATCH 1/1 drm/ttm: Add helper functions to populate/map in one call
These functions replace a section of common code found in radeon/amdgpu drivers (and possibly others) as part of the ttm_tt_*populate() callbacks.
--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 41 ++++++++++++++++++++++++++++++++++++ include/drm/ttm/ttm_page_alloc.h | 11 ++++++++++ 2 files changed, 52 insertions(+)
drivers/gpu/drm/ttm/ttm_page_alloc.c +41 -0
@@ -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 +11 -0
@@ -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)
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
ping? Haven't seen any comments on amd-gfx or dri-devel.
Cheers,
Tom
Quoted 75 lines · Tom St Denis
These functions replace a section of common code found in radeon/amdgpu drivers (and possibly others) as part of the ttm_tt_*populate() callbacks.
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 41 ++++++++++++++++++++++++++++++++++++ include/drm/ttm/ttm_page_alloc.h | 11 ++++++++++ 2 files changed, 52 insertions(+)drivers/gpu/drm/ttm/ttm_page_alloc.c +41
-0@@ -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 +4
-0@@ -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 +*/
include/drm/ttm/ttm_page_alloc.h extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data); · line 99
Quoted 10 lines
include/drm/ttm/ttm_page_alloc.h +7
-0+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)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 31be281b-7293-e7ef-1130-e8b6f5a01e2f-5C7GfCeVMHo@public.gmane.org
Christian König
Reviewed-byFeel free to also add my Acked-by to the nouveau patch.
Regards,
Christian.
Am 22.08.2017 um 13:13 schrieb Tom St Denis:
Quoted 95 lines
ping? Haven't seen any comments on amd-gfx or dri-devel.
Cheers,
TomQuoted 88 lines · Tom St Denis
These functions replace a section of common code found in radeon/amdgpu drivers (and possibly others) as part of the ttm_tt_*populate() callbacks.
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/ttm/ttm_page_alloc.c | 41 ++++++++++++++++++++++++++++++++++++ include/drm/ttm/ttm_page_alloc.h | 11 ++++++++++ 2 files changed, 52 insertions(+)drivers/gpu/drm/ttm/ttm_page_alloc.c +40
-0@@ -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 +4
-0@@ -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);
include/drm/ttm/ttm_page_alloc.h +5
-0+ +/** +* 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
Quoted 8 lines
Quoted 3 lines
static inline int ttm_dma_page_alloc_init(struct
ttm_mem_global*glob,
unsignedmax_pages)_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx