diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-11-15 05:34:39 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-11-15 05:34:45 +0300 |
| commit | 17cc51390c141662748dbbc2fe98f3ed10f2e13e (patch) | |
| tree | 37f4a6bdd0683e5e8980ca8872afc05fa1d1e9d9 /include/drm | |
| parent | 2d0720f5a4fc2aa5ae92f21fc113d7626b5a3c9f (diff) | |
| parent | b4011644b03c04b1a42068313c5b894da41d0698 (diff) | |
| download | linux-17cc51390c141662748dbbc2fe98f3ed10f2e13e.tar.xz | |
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next
Two minor cleanups / fixes for -next.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m=20=28VMware=29?=
Link: https://patchwork.freedesktop.org/patch/msgid/20191114131703.8607-1-thomas_os@shipmail.org
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/ttm/ttm_page_alloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h index 4d9b019d253c..a6b6ef5f9bf4 100644 --- a/include/drm/ttm/ttm_page_alloc.h +++ b/include/drm/ttm/ttm_page_alloc.h @@ -74,7 +74,7 @@ void ttm_unmap_and_unpopulate_pages(struct device *dev, struct ttm_dma_tt *tt); */ int ttm_page_alloc_debugfs(struct seq_file *m, void *data); -#if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU) +#if defined(CONFIG_DRM_TTM_DMA_PAGE_POOL) /** * Initialize pool allocator. */ |