diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-09-04 11:01:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-09-04 11:01:18 +0200 |
| commit | edc2988c548db05e33b921fed15821010bc74895 (patch) | |
| tree | b35860428acea35e5866d4cf007519ed943a85de /drivers/gpu/drm/etnaviv/Kconfig | |
| parent | locking/lockdep/selftests: Fix mixed read-write ABBA tests (diff) | |
| parent | Merge branch 'docs-next' of git://git.lwn.net/linux (diff) | |
| download | linux-edc2988c548db05e33b921fed15821010bc74895.tar.xz linux-edc2988c548db05e33b921fed15821010bc74895.zip | |
Merge branch 'linus' into locking/core, to fix up conflicts
Conflicts:
mm/page_alloc.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/Kconfig b/drivers/gpu/drm/etnaviv/Kconfig index 71cee4e9fefb..38b477b5fbf9 100644 --- a/drivers/gpu/drm/etnaviv/Kconfig +++ b/drivers/gpu/drm/etnaviv/Kconfig @@ -10,6 +10,8 @@ config DRM_ETNAVIV select IOMMU_API select IOMMU_SUPPORT select WANT_DEV_COREDUMP + select CMA if HAVE_DMA_CONTIGUOUS + select DMA_CMA if HAVE_DMA_CONTIGUOUS help DRM driver for Vivante GPUs. |