From: zsq <zsq@rock-chips.com>
Date: Thu, 18 Oct 2012 10:01:19 +0000 (+0800)
Subject: add rga soft reset when rga time out happen
X-Git-Tag: firefly_0821_release~8372
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=00f67160e5eafa06afd8eb39b8461ccc3627747d;p=firefly-linux-kernel-4.4.55.git

add rga soft reset when rga time out happen
---

diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c
index 505e37f715ed..38d0683a4ee0 100755
--- a/drivers/video/rockchip/rga/rga_drv.c
+++ b/drivers/video/rockchip/rga/rga_drv.c
@@ -486,9 +486,6 @@ static struct rga_reg * rga_reg_init_2(rga_session *session, struct rga_req *req
         INIT_LIST_HEAD(&reg1->session_link);
     	INIT_LIST_HEAD(&reg1->status_link);
 
-        //memcpy(&reg0->req, req0, sizeof(struct rga_req));
-        //memcpy(&reg1->req, req1, sizeof(struct rga_req));
-
         if(req0->mmu_info.mmu_en)
         {
             ret = rga_set_mmu_info(reg0, req0);
@@ -702,6 +699,9 @@ static void rga_del_running_list_timeout(void)
         atomic_sub(1, &reg->session->task_running);
         atomic_sub(1, &rga_service.total_running);
 
+        printk("RGA soft reset for timeout process\n");
+        rga_soft_reset();
+        
 
         #if 0
         printk("RGA_INT is %.8x\n", rga_read(RGA_INT));
diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c
index 212231e42408..67fd0c3bb2f0 100755
--- a/drivers/video/rockchip/rga/rga_mmu_info.c
+++ b/drivers/video/rockchip/rga/rga_mmu_info.c
@@ -1049,7 +1049,7 @@ static int rga_mmu_info_pre_scale_mode(struct rga_reg *reg, struct rga_req *req)
             {
                 for(i=0; i<DstMemSize; i++) 
                 {
-                    MMU_p[i] = virt_to_phys((uint32_t *)((DstStart + i)<< PAGE_SHIFT));        
+                    MMU_p[i] = virt_to_phys((uint32_t *)((DstStart + i) << PAGE_SHIFT));        
                 }    
             }                                    
         }