diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-07 06:21:42 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-07 06:21:42 +0400 |
| commit | 1e95ab5846504b2c0e9a01405bbb3278e2e20480 (patch) | |
| tree | b8af3af9373dd0bbcb7df30b5e5a7b66dbf98801 /include | |
| parent | 4695b03970df378dcb93fe3e7158381f1e980fa2 (diff) | |
| parent | d92d985177c495aab53c7167f310a7efb1853918 (diff) | |
| download | linux-1e95ab5846504b2c0e9a01405bbb3278e2e20480.tar.xz | |
Merge branch 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next
Pull request for vmwgfx. Currently just the DMA address stuff.
* 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Use the linux DMA api to get valid device addresses of pages
drm/ttm: Enable the dma page pool also for intel IOMMUs
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); 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 |