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 505e37f715ed20464c3fbe79c9184b752a27f39d..38d0683a4ee0f3b4d41e230385f4496ca5cc4a67 100755 (executable)
--- 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);\r
        INIT_LIST_HEAD(&reg1->status_link);\r
 \r
-        //memcpy(&reg0->req, req0, sizeof(struct rga_req));\r
-        //memcpy(&reg1->req, req1, sizeof(struct rga_req));\r
-\r
         if(req0->mmu_info.mmu_en)\r
         {\r
             ret = rga_set_mmu_info(reg0, req0);\r
@@ -702,6 +699,9 @@ static void rga_del_running_list_timeout(void)
         atomic_sub(1, &reg->session->task_running);\r
         atomic_sub(1, &rga_service.total_running);\r
 \r
+        printk("RGA soft reset for timeout process\n");\r
+        rga_soft_reset();\r
+        \r
 \r
         #if 0\r
         printk("RGA_INT is %.8x\n", rga_read(RGA_INT));\r

diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c
index 212231e42408f16956f511e361ce7419541d5f60..67fd0c3bb2f0a0ab20ec4e379ebcbcdb4f19ad5f 100755 (executable)
--- 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)
             {\r
                 for(i=0; i<DstMemSize; i++) \r
                 {\r
-                    MMU_p[i] = virt_to_phys((uint32_t *)((DstStart + i)<< PAGE_SHIFT));        \r
+                    MMU_p[i] = virt_to_phys((uint32_t *)((DstStart + i) << PAGE_SHIFT));        \r
                 }    \r
             }                                    \r
         }\r