From f4ade8e8b38f61c419a311b1669c1a4c4cda082f Mon Sep 17 00:00:00 2001
From: zsq <zsq@rock-chips.com>
Date: Fri, 6 Jun 2014 14:27:51 +0800
Subject: [PATCH] del RGA suppot iommu releate to IOMMU must be open

---
 drivers/video/rockchip/rga2/rga2_drv.c      | 25 +--------------------
 drivers/video/rockchip/rga2/rga2_mmu_info.c |  5 +----
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c
index d739a8a5c988..222109173422 100755
--- a/drivers/video/rockchip/rga2/rga2_drv.c
+++ b/drivers/video/rockchip/rga2/rga2_drv.c
@@ -687,13 +687,11 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
 	ion_phys_addr_t phy_addr;
 	size_t len;
     int ret;
-    
-    #ifdef CONFIG_RGA_IOMMU
+
     req->sg_src0 = NULL;
     req->sg_src1 = NULL;
     req->sg_dst  = NULL;
     req->sg_els  = NULL;
-    #endif
 
     if(req->src.yrgb_addr) {
         hdl = ion_import_dma_buf(rga2_drvdata->ion_client, req->src.yrgb_addr);
@@ -702,7 +700,6 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
             printk("RGA2 ERROR ion buf handle\n");
             return ret;
         }
-        #ifdef CONFIG_RGA_IOMMU
         if (req->mmu_info.src0_mmu_flag) {
             req->sg_src0 = ion_sg_table(rga2_drvdata->ion_client, hdl);
             req->src.yrgb_addr = req->src.uv_addr;
@@ -715,12 +712,6 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
             req->src.uv_addr = req->src.yrgb_addr + (req->src.vir_w * req->src.vir_h);
             req->src.v_addr = req->src.uv_addr + (req->src.vir_w * req->src.vir_h)/4;
         }
-        #else
-        ion_phys(rga2_drvdata->ion_client, hdl, &phy_addr, &len);
-        req->src.yrgb_addr = phy_addr;
-        req->src.uv_addr = req->src.yrgb_addr + (req->src.vir_w * req->src.vir_h);
-        req->src.v_addr = req->src.uv_addr + (req->src.vir_w * req->src.vir_h)/4;
-        #endif
         ion_free(rga2_drvdata->ion_client, hdl);
     }
     else {
@@ -736,7 +727,6 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
             printk("RGA2 ERROR ion buf handle\n");
             return ret;
         }
-        #ifdef CONFIG_RGA_IOMMU
         if (req->mmu_info.dst_mmu_flag) {
             req->sg_dst = ion_sg_table(rga2_drvdata->ion_client, hdl);
             req->dst.yrgb_addr = req->dst.uv_addr;
@@ -749,12 +739,6 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
             req->dst.uv_addr = req->dst.yrgb_addr + (req->dst.vir_w * req->dst.vir_h);
             req->dst.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;
         }
-        #else
-	    ion_phys(rga2_drvdata->ion_client, hdl, &phy_addr, &len);
-        req->dst.yrgb_addr = phy_addr;
-        req->dst.uv_addr = req->dst.yrgb_addr + (req->dst.vir_w * req->dst.vir_h);
-        req->dst.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;
-        #endif
         ion_free(rga2_drvdata->ion_client, hdl);
     }
     else {
@@ -770,7 +754,6 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
             printk("RGA2 ERROR ion buf handle\n");
             return ret;
         }
-        #ifdef CONFIG_RGA_IOMMU
         if (req->mmu_info.dst_mmu_flag) {
             req->sg_src1 = ion_sg_table(rga2_drvdata->ion_client, hdl);
             req->src1.yrgb_addr = 0;
@@ -783,12 +766,6 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
             req->src1.uv_addr = req->dst.yrgb_addr + (req->dst.vir_w * req->dst.vir_h);
             req->src1.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;
         }
-        #else
-	ion_phys(rga2_drvdata->ion_client, hdl, &phy_addr, &len);
-        req->src1.yrgb_addr = phy_addr;
-        req->src1.uv_addr = req->dst.yrgb_addr + (req->dst.vir_w * req->dst.vir_h);
-        req->src1.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;
-        #endif
         ion_free(rga2_drvdata->ion_client, hdl);
     }
     else {
diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.c b/drivers/video/rockchip/rga2/rga2_mmu_info.c
index 5a75cac8ebe5..b975f4a73c2f 100644
--- a/drivers/video/rockchip/rga2/rga2_mmu_info.c
+++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c
@@ -409,17 +409,14 @@ static int rga2_MapION(struct sg_table *sg,
 
     status = 0;
     Address = 0;
-    //printk("pageCount=%d\n", pageCount);
     do {
         len = sg_dma_len(sgl) >> PAGE_SHIFT;
         Address = sg_phys(sgl);
-        //printk("len = %d\n", len);
-        //printk("Address = %.8x\n", Address);
+
         for(i=0; i<len; i++) {
             Memory[mapped_size + i] = Address + (i << PAGE_SHIFT);
         }
 
-        //printk("mapped_size = %d\n", mapped_size);
         mapped_size += len;
         sg_num += 1;
     }
-- 
2.34.1