diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-17 17:08:11 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-26 10:24:28 +0900 |
| commit | 650c3761e6163fd681a392d49dbb97d8fa9a0bbb (patch) | |
| tree | 24a15619e072d877b11d59d07b84796a6f4b2b2c | |
| parent | 5c2fc19957e701012b8c84cd656f50468ca41e41 (diff) | |
| download | nouveau-650c3761e6163fd681a392d49dbb97d8fa9a0bbb.tar.gz | |
WAR: disable SWIOTLB on ARM64
We don't want to use the DMA API and CMA!
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
| -rw-r--r-- | drm/nouveau/nouveau_bo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/nouveau/nouveau_bo.c b/drm/nouveau/nouveau_bo.c index e3acc35e3..43a620a22 100644 --- a/drm/nouveau/nouveau_bo.c +++ b/drm/nouveau/nouveau_bo.c @@ -1502,7 +1502,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *ttm) } #endif -#ifdef CONFIG_SWIOTLB +#if IS_ENABLED(CONFIG_SWIOTLB) && !IS_ENABLED(CONFIG_ARM64) if (swiotlb_nr_tbl()) { return ttm_dma_populate((void *)ttm, dev->dev); } @@ -1570,7 +1570,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm) } #endif -#ifdef CONFIG_SWIOTLB +#if IS_ENABLED(CONFIG_SWIOTLB) && !IS_ENABLED(CONFIG_ARM64) if (swiotlb_nr_tbl()) { ttm_dma_unpopulate((void *)ttm, dev->dev); return; |