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

Commit 7aeb7448 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/ttm: Enable the dma page pool also for intel IOMMUs 



Used by the vmwgfx driver

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 4695b039

drivers/gpu/drm/ttm/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ ccflags-y := -Iinclude/drm 
ttm-y := ttm_agp_backend.o ttm_memory.o ttm_tt.o ttm_bo.o \

	ttm_bo_util.o ttm_bo_vm.o ttm_module.o \

	ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o \

	ttm_bo_manager.o



ifeq ($(CONFIG_SWIOTLB),y)

ttm-y += ttm_page_alloc_dma.o

endif

	ttm_bo_manager.o ttm_page_alloc_dma.o



obj-$(CONFIG_DRM_TTM) += ttm.o

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
 *   when freed).

 */



#if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU)

#define pr_fmt(fmt) "[TTM] " fmt



#include <linux/dma-mapping.h>
@@ -1142,3 +1143,5 @@ int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data) 
	return 0;

}

EXPORT_SYMBOL_GPL(ttm_dma_page_alloc_debugfs);



#endif

include/drm/ttm/ttm_page_alloc.h

+10 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ extern void ttm_pool_unpopulate(struct ttm_tt *ttm); 
extern int ttm_page_alloc_debugfs(struct seq_file *m, void *data);





#ifdef CONFIG_SWIOTLB

#if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU)

/**

 * Initialize pool allocator.

 */
@@ -94,6 +94,15 @@ static inline int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data) 
{

	return 0;

}

static inline int ttm_dma_populate(struct ttm_dma_tt *ttm_dma,

				   struct device *dev)

{

	return -ENOMEM;

}

static inline void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma,

				      struct device *dev)

{

}

#endif



#endif