projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/for-linus-5.13' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-block.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_ttm.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_ttm.c
b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index b81ae90b8449848d7c707c4239f510a97f9a9c22..e8b506a6685b569822f8cee3b74988b947c9be86 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_ttm.c
@@
-321,7
+321,7
@@
nouveau_ttm_init(struct nouveau_drm *drm)
}
#if IS_ENABLED(CONFIG_SWIOTLB) && IS_ENABLED(CONFIG_X86)
- need_swiotlb =
!!swiotlb_nr_tbl
();
+ need_swiotlb =
is_swiotlb_active
();
#endif
ret = ttm_device_init(&drm->ttm.bdev, &nouveau_bo_driver, drm->dev->dev,