[PATCH v3 4/6] drm: rockchip: use common iommu api to attach iommu

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index f5a68fc..b52c38d 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c

@@ -14,16 +14,16 @@
  * GNU General Public License for more details.
  */

-#include <asm/dma-iommu.h>
-
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <linux/dma-iommu.h>
 #include <linux/dma-mapping.h>
 #include <linux/pm_runtime.h>
 #include <linux/module.h>
 #include <linux/of_graph.h>
 #include <linux/component.h>
+#include <linux/iommu.h>

 #include "rockchip_drm_drv.h"
 #include "rockchip_drm_fb.h"

@@ -46,7 +46,8 @@ static bool is_support_iommu = true;
 int rockchip_drm_dma_attach_device(struct drm_device *drm_dev,
                                   struct device *dev)
 {
-       struct dma_iommu_mapping *mapping = drm_dev->dev->archdata.mapping;
+       struct rockchip_drm_private *private = drm_dev->dev_private;
+       struct iommu_domain *domain = private->domain;
        int ret;

        if (!is_support_iommu)

@@ -58,16 +59,25 @@ int rockchip_drm_dma_attach_device(struct drm_device *drm_dev,

        dma_set_max_seg_size(dev, DMA_BIT_MASK(32));

-       return arm_iommu_attach_device(dev, mapping);
+       ret = iommu_attach_device(domain, dev);
+       if (ret) {
+               dev_err(dev, "Failed to attach iommu device\n");
+               return ret;
+       }
+
+       /* TODO(djkurtz): fetch the mapping start/size from somewhere */
+       arch_setup_dma_ops(dev, 0x00000000, SZ_2G, dev->bus->iommu_ops, false);
+       return 0;
 }

 void rockchip_drm_dma_detach_device(struct drm_device *drm_dev,
                                    struct device *dev)
 {
-       if (!is_support_iommu)
-               return;
+       struct rockchip_drm_private *private = drm_dev->dev_private;
+       struct iommu_domain *domain = private->domain;

-       arm_iommu_detach_device(dev);
+       if (is_support_iommu)
+               iommu_detach_device(domain, dev);
 }

 int rockchip_register_crtc_funcs(struct drm_crtc *crtc,

@@ -132,10 +142,52 @@ static void rockchip_drm_crtc_disable_vblank(struct drm_device *dev,
                priv->crtc_funcs[pipe]->disable_vblank(crtc);
 }

+static int rockchip_drm_init_iommu(struct drm_device *drm_dev)
+{
+       struct rockchip_drm_private *private = drm_dev->dev_private;
+       struct device *dev = drm_dev->dev;
+       int ret;
+
+       dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
+                                     GFP_KERNEL);
+       if (!dev->dma_parms)
+               return -ENOMEM;
+
+       private->domain = iommu_domain_alloc(&platform_bus_type);
+       if (!private->domain)
+               return -ENOMEM;
+
+       /* TODO(djkurtz): fetch the mapping start/size from somewhere */
+       ret = iommu_dma_init_domain(private->domain, 0x00000000, SZ_2G);
+       if (ret) {
+               dev_err(dev, "Failed to init domain\n");
+               goto err_free_domain;
+       }
+
+       ret = rockchip_drm_dma_attach_device(drm_dev, dev);
+       if (ret) {
+               dev_err(dev, "Failed to attach device\n");
+               goto err_free_domain;
+       }
+
+       return 0;
+
+err_free_domain:
+       iommu_domain_free(private->domain);
+
+       return ret;
+}
+
+static void rockchip_iommu_cleanup(struct drm_device *drm_dev)
+{
+       struct rockchip_drm_private *private = drm_dev->dev_private;
+