From 2870dd639e6ce7129d5cab478e1a5ac6f15af732 Mon Sep 17 00:00:00 2001
From: zsq <zsq@rock-chips.com>
Date: Wed, 8 Aug 2012 21:06:16 +0800
Subject: [PATCH] add soft reset for rga alpha mode can't use current

---
 drivers/video/rockchip/rga/rga_drv.c      | 28 ++++++++++-------
 drivers/video/rockchip/rga/rga_reg_info.c | 38 ++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c
index 65f17f4e412e..06fdf674639e 100755
--- a/drivers/video/rockchip/rga/rga_drv.c
+++ b/drivers/video/rockchip/rga/rga_drv.c
@@ -136,7 +136,7 @@ static inline u32 rga_read(u32 r)
 	return __raw_readl(drvdata->rga_base + r);
 }
 
-#if defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK31)
+#if 1//defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK31)
 static void rga_soft_reset(void)
 {
 	u32 i;
@@ -590,6 +590,8 @@ static void rga_try_set_reg(void)
             #elif defined(CONFIG_ARCH_RK31)
             rga_soft_reset();
             #endif
+
+            rga_soft_reset();
             
             rga_write(0, RGA_MMU_CTRL);
 
@@ -652,6 +654,10 @@ static void print_info(struct rga_req *req)
 
     printk("clip.xmin = %d, clip.xmax = %d. clip.ymin = %d, clip.ymax = %d\n",
         req->clip.xmin, req->clip.xmax, req->clip.ymin, req->clip.ymax);
+
+    printk("alpha_rop_flag = %.8x\n", req->alpha_rop_flag);
+    printk("alpha_rop_mode = %.8x\n", req->alpha_rop_mode);
+    printk("PD_mode = %.8x\n", req->PD_mode);
 }
 #endif
 
@@ -778,7 +784,7 @@ static int rga_blit(rga_session *session, struct rga_req *req)
     sah = req->src.act_h;
     daw = req->dst.act_w;
     dah = req->dst.act_h;
-
+     
     do
     {
         if((req->render_mode == bitblt_mode) && (((saw>>1) >= daw) || ((sah>>1) >= dah)))
@@ -1055,7 +1061,7 @@ static irqreturn_t rga_irq_thread(int irq, void *dev_id)
 		rga_del_running_list();
 		rga_try_set_reg();
 	}
-    printk("****** rga irq prc avil ******\n");
+    //printk("****** rga irq prc avil ******\n");
 	mutex_unlock(&rga_service.lock);
 
 	return IRQ_HANDLED;
@@ -1252,7 +1258,7 @@ static int __init rga_init(void)
 			return ret;
 	}
 
-   // rga_test_0();
+    //rga_test_0();
 
 	INFO("Module initialized.\n");
 
@@ -1291,8 +1297,8 @@ EXPORT_SYMBOL(rk_direct_fb_show);
 
 #endif
 
-unsigned int src_buf[1920*1080];
-unsigned int dst_buf[1920*1080];
+unsigned int src_buf[320*240];
+unsigned int dst_buf[1024*768];
 
 void rga_test_0(void)
 {
@@ -1319,7 +1325,7 @@ void rga_test_0(void)
     src = src_buf;
     dst = dst_buf;
 
-    memset(src_buf, 0xff, 1920*1080*4);
+    memset(src_buf, 0xff, 320*240*4);
 
     dmac_flush_range(&src_buf[0], &src_buf[1920*1080]);
     outer_flush_range(virt_to_phys(&src_buf[0]),virt_to_phys(&src_buf[1024*1024]));
@@ -1345,8 +1351,8 @@ void rga_test_0(void)
     req.dst.act_w = 320;
     req.dst.act_h = 240;
 
-    req.dst.vir_w = 800;
-    req.dst.vir_h = 480;
+    req.dst.vir_w = 1024;
+    req.dst.vir_h = 768;
     req.dst.x_offset = 0;
     req.dst.y_offset = 0;
     req.dst.yrgb_addr = (uint32_t)virt_to_phys(dst);
@@ -1354,9 +1360,9 @@ void rga_test_0(void)
     //req.dst.format = RK_FORMAT_RGB_565;
 
     req.clip.xmin = 0;
-    req.clip.xmax = 799;
+    req.clip.xmax = 1023;
     req.clip.ymin = 0;
-    req.clip.ymax = 479;
+    req.clip.ymax = 767;
 
     //req.render_mode = color_fill_mode;
     //req.fg_color = 0x80ffffff;
diff --git a/drivers/video/rockchip/rga/rga_reg_info.c b/drivers/video/rockchip/rga/rga_reg_info.c
index f45e710ae526..055827e55752 100755
--- a/drivers/video/rockchip/rga/rga_reg_info.c
+++ b/drivers/video/rockchip/rga/rga_reg_info.c
@@ -1,6 +1,36 @@
 
 //#include <linux/kernel.h>
 #include <linux/memory.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/sched.h>
+#include <linux/mutex.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+#include <asm/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <mach/io.h>
+#include <mach/irqs.h>
+#include <linux/fs.h>
+#include <asm/uaccess.h>
+#include <linux/miscdevice.h>
+#include <linux/poll.h>
+#include <linux/delay.h>
+#include <linux/wait.h>
+#include <linux/syscalls.h>
+#include <linux/timer.h>
+#include <linux/time.h>
+#include <asm/cacheflush.h>
+#include <linux/slab.h>
+#include <linux/fb.h>
+#include <linux/wakelock.h>
+
 #include "rga_reg_info.h"
 #include "rga_rop.h"
 #include "rga.h"
@@ -704,7 +734,11 @@ s32 RGA_set_dst(u8 *base, const struct rga_req *msg)
     rop_mask_stride = (((msg->src.vir_w + 7)>>3) + 3) & (~3);//not dst_vir.w,hxx,2011.7.21
     
     reg = (stride >> 2) & 0xffff;
-    reg = reg | ((rop_mask_stride>>2) << 16);    
+    reg = reg | ((rop_mask_stride>>2) << 16);
+
+    #if defined(CONFIG_ARCH_RK2928)
+    reg = reg | ((msg->alpha_rop_mode & 3) << 28);
+    #endif
 
     if (msg->render_mode == line_point_drawing_mode)
     {
@@ -1057,6 +1091,8 @@ RGA_set_bitblt_reg_info(u8 *base, const struct rga_req * msg, TILE_INFO *tile)
     stride = (msg->dst.vir_w * pixel_width + 3) & (~3);
     *bRGA_DST_MST = (u32)msg->dst.yrgb_addr + (tile->dst_ctrl.y_off * stride) + (tile->dst_ctrl.x_off * pixel_width);
     *bRGA_DST_CTR_INFO = (tile->dst_ctrl.w) | ((tile->dst_ctrl.h) << 16);
+
+    *bRGA_DST_CTR_INFO |= (1<<29);
 }
 
 
-- 
2.34.1