From fba382768899f0390df3dd6db884a03c5cb2077f Mon Sep 17 00:00:00 2001
From: zsq <zsq@rock-chips.com>
Date: Fri, 28 Sep 2012 15:13:28 +0800
Subject: [PATCH] fix rga process pre scale with offset

---
 drivers/video/rockchip/rga/RGA_API.c | 3 +++
 drivers/video/rockchip/rga/rga_drv.c | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/drivers/video/rockchip/rga/RGA_API.c b/drivers/video/rockchip/rga/RGA_API.c
index 30ebe0c8dfe3..0b48f95c8e5a 100755
--- a/drivers/video/rockchip/rga/RGA_API.c
+++ b/drivers/video/rockchip/rga/RGA_API.c
@@ -190,6 +190,9 @@ int32_t RGA_gen_two_pro(struct rga_req *msg, struct rga_req *msg1)
     msg1->src.act_h = msg->dst.act_h;
     msg1->src.vir_w = msg->dst.vir_w;
     msg1->src.vir_h = msg->dst.vir_h;
+
+    msg1->src.x_offset = 0;
+    msg1->src.y_offset = 0;
             
     return 0;
 }
diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c
index 555647126dff..7bd7fd7202f9 100755
--- a/drivers/video/rockchip/rga/rga_drv.c
+++ b/drivers/video/rockchip/rga/rga_drv.c
@@ -878,6 +878,10 @@ static int rga_blit_sync(rga_session *session, struct rga_req *req)
     #endif
 
     ret = rga_blit(session, req);
+    if(ret < 0)
+    {
+        return ret;
+    }
 
     ret_timeout = wait_event_interruptible_timeout(session->wait, atomic_read(&session->done), RGA_TIMEOUT_DELAY);
 
-- 
2.34.1