diff options
| author |   Christian König <christian.koenig@amd.com> | 2020-10-30 12:11:38 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-11-02 11:43:44 +0100 |
| commit | 4dbafbd30aefcc1e56086875c5aa940490c0a9c3 (patch) | |
| tree | d748d5a67a8b04cf9570d072a88fb8179d8dbc05 /drivers/gpu/drm/nouveau | |
| parent | drm/panfrost: Don't corrupt the queue mutex on open/close (diff) | |
| download | linux-dev-4dbafbd30aefcc1e56086875c5aa940490c0a9c3.tar.xz linux-dev-4dbafbd30aefcc1e56086875c5aa940490c0a9c3.zip | |
drm/nouveu: fix swiotlb include
The check for swiotlb has moved to nouveu_ttm.c, but we forgot to move
the include as well.
This blows up only when merged with linux-next, not sure why drm-misc-next
works stand alone.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/397835/
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ttm.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 746c06ed195b..8133377d865d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -28,7 +28,6 @@ */ #include <linux/dma-mapping.h> -#include <linux/swiotlb.h> #include "nouveau_drv.h" #include "nouveau_chan.h" diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index d696d882c9eb..2bf36229dd57 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -22,6 +22,9 @@ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +#include <linux/swiotlb.h> + #include "nouveau_drv.h" #include "nouveau_gem.h" #include "nouveau_mem.h" |