fix rga2 color fill bug

diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c
index c35fe94688c40d2047ee209b479b01a1c9f89ada..5af573b33fddfaad9afef5f7b408e25c2d7a6b47 100755 (executable)
--- a/drivers/video/rockchip/rga2/rga2_drv.c
+++ b/drivers/video/rockchip/rga2/rga2_drv.c
@@ -559,7 +559,7 @@ static void rga2_try_set_reg(void)
             rga2_write(virt_to_phys(rga2_service.cmd_buff), RGA2_CMD_BASE);\r
 \r
 #if RGA2_TEST\r
-            if(1)//rga2_flag)\r
+            if(rga2_flag)\r
             {\r
                 //printk(KERN_DEBUG "cmd_addr = %.8x\n", rga_read(RGA_CMD_ADDR));\r
                 uint32_t i, *p;\r
@@ -584,7 +584,7 @@ static void rga2_try_set_reg(void)
             atomic_set(&reg->session->done, 0);\r
             rga2_write(0x1, RGA2_CMD_CTRL);\r
 #if RGA2_TEST\r
-            if(1)//rga2_flag)\r
+            if(rga2_flag)\r
             {\r
                 uint32_t i;\r
                 printk("CMD_READ_BACK_REG\n");\r
@@ -784,7 +784,7 @@ static int rga2_blit_sync(rga2_session *session, struct rga2_req *req)
     int ret_timeout = 0;\r
 \r
     #if RGA2_TEST_MSG\r
-    if (req->src.format >= 0x10) {\r
+    if (req->bitblt_mode == 0x2) {\r
         print_info(req);\r
         rga2_flag = 1;\r
         printk("*** rga2_blit_sync proc ***\n");\r

diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.c b/drivers/video/rockchip/rga2/rga2_reg_info.c
index 934bb6d204a8a53ea5a9032f507b09df5524c315..eff8fed668f01bad7565abc9aff09132f04ddc66 100644 (file)
--- a/drivers/video/rockchip/rga2/rga2_reg_info.c
+++ b/drivers/video/rockchip/rga2/rga2_reg_info.c
@@ -220,8 +220,7 @@ RGA2_set_reg_src_info(RK_U8 *base, struct rga2_req *msg)
             scale_h_flag = 1;\r
         else if (sh < dh)\r
             scale_h_flag = 2;\r
-        else\r
-        {\r
+        else {\r
             scale_h_flag = 0;\r
             if(msg->rotate_mode >> 6)\r
                 scale_h_flag = 3;\r
@@ -960,6 +959,8 @@ void RGA_MSG_2_RGA2_MSG(struct rga_req *req_rga, struct rga2_req *req)
         req->render_mode = update_patten_buff_mode;\r
     else if (req_rga->render_mode == 5)\r
         req->render_mode = bitblt_mode;\r
+    else\r
+        req->render_mode = req_rga->render_mode;\r
 \r
     memcpy(&req->src, &req_rga->src, sizeof(req_rga->src));\r
     memcpy(&req->dst, &req_rga->dst, sizeof(req_rga->dst));\r
@@ -1018,8 +1019,8 @@ void RGA_MSG_2_RGA2_MSG(struct rga_req *req_rga, struct rga2_req *req)
     req->rop_mode = 0;\r
 \r
     req->color_fill_mode = req_rga->color_fill_mode;\r
-    req->color_key_min = req_rga->color_key_min;\r
-    req->color_key_max = req_rga->color_key_max;\r
+    req->color_key_min   = req_rga->color_key_min;\r
+    req->color_key_max   = req_rga->color_key_max;\r
 \r
     req->fg_color = req_rga->fg_color;\r
     req->bg_color = req_rga->bg_color;\r