| Message ID | 20170905113205.8733-1-tom.stdenis@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 05.09.2017 um 13:32 schrieb Tom St Denis: > Fixed kbuild errors when IOMMU/SWIOTLB are disabled. > > Signed-off-by: Tom St Denis <tom.stdenis@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c > index 6a660d196d87..052e1f102113 100644 > --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c > +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c > @@ -920,6 +920,7 @@ void ttm_pool_unpopulate(struct ttm_tt *ttm) > } > EXPORT_SYMBOL(ttm_pool_unpopulate); > > +#if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU) > int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt) > { > unsigned i; > @@ -960,6 +961,7 @@ void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt) > ttm_pool_unpopulate(&tt->ttm); > } > EXPORT_SYMBOL(ttm_unmap_and_unpopulate_pages); > +#endif > > int ttm_page_alloc_debugfs(struct seq_file *m, void *data) > {
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index 6a660d196d87..052e1f102113 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -920,6 +920,7 @@ void ttm_pool_unpopulate(struct ttm_tt *ttm) } EXPORT_SYMBOL(ttm_pool_unpopulate); +#if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU) int ttm_populate_and_map_pages(struct device *dev, struct ttm_dma_tt *tt) { unsigned i; @@ -960,6 +961,7 @@ void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt) ttm_pool_unpopulate(&tt->ttm); } EXPORT_SYMBOL(ttm_unmap_and_unpopulate_pages); +#endif int ttm_page_alloc_debugfs(struct seq_file *m, void *data) {
Fixed kbuild errors when IOMMU/SWIOTLB are disabled. Signed-off-by: Tom St Denis <tom.stdenis@amd.com> --- drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 ++ 1 file changed, 2 insertions(+)