diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2013-10-24 04:24:54 -0400 |
---|---|---|
committer | Thomas Hellstrom <thellstrom@vmware.com> | 2013-11-06 06:55:52 -0500 |
commit | 7aeb7448d8d02868ef30a6d08e856b2220319273 (patch) | |
tree | 2b12ced2a7607b6305ff6a41d933d5b0b55c23a0 /include | |
parent | 4695b03970df378dcb93fe3e7158381f1e980fa2 (diff) |
drm/ttm: Enable the dma page pool also for intel IOMMUs
Used by the vmwgfx driver
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/ttm/ttm_page_alloc.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h index 706b962c6467..d1f61bfe0ebe 100644 --- a/include/drm/ttm/ttm_page_alloc.h +++ b/include/drm/ttm/ttm_page_alloc.h | |||
@@ -62,7 +62,7 @@ extern void ttm_pool_unpopulate(struct ttm_tt *ttm); | |||
62 | extern int ttm_page_alloc_debugfs(struct seq_file *m, void *data); | 62 | extern int ttm_page_alloc_debugfs(struct seq_file *m, void *data); |
63 | 63 | ||
64 | 64 | ||
65 | #ifdef CONFIG_SWIOTLB | 65 | #if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU) |
66 | /** | 66 | /** |
67 | * Initialize pool allocator. | 67 | * Initialize pool allocator. |
68 | */ | 68 | */ |
@@ -94,6 +94,15 @@ static inline int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data) | |||
94 | { | 94 | { |
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |
97 | static inline int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, | ||
98 | struct device *dev) | ||
99 | { | ||
100 | return -ENOMEM; | ||
101 | } | ||
102 | static inline void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, | ||
103 | struct device *dev) | ||
104 | { | ||
105 | } | ||
97 | #endif | 106 | #endif |
98 | 107 | ||
99 | #endif | 108 | #endif |