From 088a76c1c52ba41ecd5e323444055b7804c7b953 Mon Sep 17 00:00:00 2001 From: zsq Date: Thu, 27 Mar 2014 11:12:46 +0800 Subject: [PATCH] fix rga2 color fill bug --- drivers/video/rockchip/rga2/rga2_drv.c | 6 +++--- drivers/video/rockchip/rga2/rga2_reg_info.c | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c index c35fe94688c4..5af573b33fdd 100755 --- 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); #if RGA2_TEST - if(1)//rga2_flag) + if(rga2_flag) { //printk(KERN_DEBUG "cmd_addr = %.8x\n", rga_read(RGA_CMD_ADDR)); uint32_t i, *p; @@ -584,7 +584,7 @@ static void rga2_try_set_reg(void) atomic_set(®->session->done, 0); rga2_write(0x1, RGA2_CMD_CTRL); #if RGA2_TEST - if(1)//rga2_flag) + if(rga2_flag) { uint32_t i; printk("CMD_READ_BACK_REG\n"); @@ -784,7 +784,7 @@ static int rga2_blit_sync(rga2_session *session, struct rga2_req *req) int ret_timeout = 0; #if RGA2_TEST_MSG - if (req->src.format >= 0x10) { + if (req->bitblt_mode == 0x2) { print_info(req); rga2_flag = 1; printk("*** rga2_blit_sync proc ***\n"); diff --git a/drivers/video/rockchip/rga2/rga2_reg_info.c b/drivers/video/rockchip/rga2/rga2_reg_info.c index 934bb6d204a8..eff8fed668f0 100644 --- 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; else if (sh < dh) scale_h_flag = 2; - else - { + else { scale_h_flag = 0; if(msg->rotate_mode >> 6) scale_h_flag = 3; @@ -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; else if (req_rga->render_mode == 5) req->render_mode = bitblt_mode; + else + req->render_mode = req_rga->render_mode; memcpy(&req->src, &req_rga->src, sizeof(req_rga->src)); memcpy(&req->dst, &req_rga->dst, sizeof(req_rga->dst)); @@ -1018,8 +1019,8 @@ void RGA_MSG_2_RGA2_MSG(struct rga_req *req_rga, struct rga2_req *req) req->rop_mode = 0; req->color_fill_mode = req_rga->color_fill_mode; - req->color_key_min = req_rga->color_key_min; - req->color_key_max = req_rga->color_key_max; + req->color_key_min = req_rga->color_key_min; + req->color_key_max = req_rga->color_key_max; req->fg_color = req_rga->fg_color; req->bg_color = req_rga->bg_color; -- 2.34.1