Commit <17de3f5fdd35> ("iommu: Retire bus ops") removes iommu ops from
the bus structure. The iommu subsystem no longer relies on bus for
operations. So iommu_domain_alloc() interface is no longer relevant.

Replace iommu_domain_alloc() with iommu_paging_domain_alloc() which takes
the physical device from which the host1x_device virtual device was
instantiated. This physical device is a common parent to all physical
devices that are part of the virtual device.

Suggested-by: Thierry Reding <thierry.red...@gmail.com>
Signed-off-by: Lu Baolu <baolu...@linux.intel.com>
---
 drivers/gpu/drm/tegra/drm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 03d1c76aec2d..d79c76a287f2 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -1135,6 +1135,7 @@ static bool host1x_drm_wants_iommu(struct host1x_device 
*dev)
 
 static int host1x_drm_probe(struct host1x_device *dev)
 {
+       struct device *dma_dev = dev->dev.parent;
        struct tegra_drm *tegra;
        struct drm_device *drm;
        int err;
@@ -1149,8 +1150,8 @@ static int host1x_drm_probe(struct host1x_device *dev)
                goto put;
        }
 
-       if (host1x_drm_wants_iommu(dev) && iommu_present(&platform_bus_type)) {
-               tegra->domain = iommu_domain_alloc(&platform_bus_type);
+       if (host1x_drm_wants_iommu(dev) && device_iommu_mapped(dma_dev)) {
+               tegra->domain = iommu_paging_domain_alloc(dma_dev);
                if (!tegra->domain) {
                        err = -ENOMEM;
                        goto free;
-- 
2.34.1

Reply via email to