diff options
author | Robin Murphy <robin.murphy@arm.com> | 2022-04-05 15:21:34 +0100 |
---|---|---|
committer | Lyude Paul <lyude@redhat.com> | 2022-05-06 17:23:17 -0400 |
commit | 87fd2b091fb33871a7f812658a0971e8e26f903f (patch) | |
tree | 13676c6d1e4187e6283aa444ca0aa2b1996dceb8 /drivers/gpu | |
parent | b3c9a924aab61adbc29df110006aa03afe1a78ba (diff) | |
download | linux-stable-87fd2b091fb33871a7f812658a0971e8e26f903f.tar.gz linux-stable-87fd2b091fb33871a7f812658a0971e8e26f903f.tar.bz2 linux-stable-87fd2b091fb33871a7f812658a0971e8e26f903f.zip |
drm/nouveau/tegra: Stop using iommu_present()
Even if some IOMMU has registered itself on the platform "bus", that
doesn't necessarily mean it provides translation for the device we
care about. Replace iommu_present() with a more appropriate check.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
[added cc for stable]
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: stable@vger.kernel.org # v5.0+
Link: https://patchwork.freedesktop.org/patch/msgid/70d40ea441da3663c2824d54102b471e9a621f8a.1649168494.git.robin.murphy@arm.com
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c index 992cc285f2fe..2ed528c065fa 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c @@ -123,7 +123,7 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev) mutex_init(&tdev->iommu.mutex); - if (iommu_present(&platform_bus_type)) { + if (device_iommu_mapped(dev)) { tdev->iommu.domain = iommu_domain_alloc(&platform_bus_type); if (!tdev->iommu.domain) goto error; |