From: zsq <zsq@rock-chips.com>
Date: Thu, 5 Jun 2014 11:10:15 +0000 (+0800)
Subject: fix rga 2 compile bug
X-Git-Tag: firefly_0821_release~5178
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=0b7a7ff4c84c5495235afd4e8d034ac08810d4ab

fix rga 2 compile bug
---

diff --git a/drivers/video/rockchip/rga2/rga2.h b/drivers/video/rockchip/rga2/rga2.h
index 799365e7ca54..d67cba9ef9dc 100644
--- a/drivers/video/rockchip/rga2/rga2.h
+++ b/drivers/video/rockchip/rga2/rga2.h
@@ -449,12 +449,10 @@ struct rga2_req
 
     u8 rgb2yuv_mode;
 
-    #if defined(CONFIG_ROCKCHIP_IOMMU) & defined(CONFIG_ION_ROCKCHIP)
     struct sg_table *sg_src0;
     struct sg_table *sg_src1;
     struct sg_table *sg_dst;
     struct sg_table *sg_els;
-    #endif
 };
 
 struct rga2_mmu_buf_t {
diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c
index e57006910fe0..d739a8a5c988 100755
--- a/drivers/video/rockchip/rga2/rga2_drv.c
+++ b/drivers/video/rockchip/rga2/rga2_drv.c
@@ -545,7 +545,6 @@ static void rga2_try_set_reg(void)
 
             rga2_power_on();
             udelay(1);
-            //mdelay(500);
 
             rga2_copy_reg(reg, 0);
             rga2_reg_from_wait_to_run(reg);
@@ -688,10 +687,13 @@ 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);
@@ -782,7 +784,7 @@ static int rga2_convert_dma_buf(struct rga2_req *req)
             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);
+	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;