rga mmu map back to origin

diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c
index 65c23b9ce290506b8ac7dfb4aa603152ddbe48de..0ca5433462a13a574c1c84e00b1360f2779533d2 100755 (executable)
--- a/drivers/video/rockchip/rga/rga_drv.c
+++ b/drivers/video/rockchip/rga/rga_drv.c
@@ -49,7 +49,7 @@
 #include "RGA_API.h"\r
 \r
 #define RGA_TEST 0\r
-#define RGA_TEST_TIME 0\r
+#define RGA_TEST_TIME 1\r
 #define RGA_TEST_FLUSH_TIME 0\r
 #define RGA_INFO_BUS_ERROR 1\r
 \r
@@ -1321,8 +1321,8 @@ EXPORT_SYMBOL(rk_direct_fb_show);
 \r
 #endif\r
 \r
-unsigned int src_buf[1280*720];\r
-unsigned int dst_buf[720*480];\r
+unsigned int src_buf[1920*1080];\r
+unsigned int dst_buf[1920*1080];\r
 \r
 void rga_test_0(void)\r
 {\r
@@ -1366,24 +1366,28 @@ void rga_test_0(void)
     outer_flush_range(virt_to_phys(&dst_buf[0]),virt_to_phys(&dst_buf[800*480]));\r
     #endif\r
 \r
+    printk("\n********************************\n");\r
+    printk("************ RGA_TEST ************\n");\r
+    printk("********************************\n\n");\r
+\r
     req.src.act_w = 1280;\r
     req.src.act_h = 720;\r
 \r
     req.src.vir_w = 1280;\r
     req.src.vir_h = 720;\r
-    req.src.yrgb_addr = (uint32_t)src;\r
+    req.src.yrgb_addr = (uint32_t)virt_to_phys(src + 128) & 0xffffffc0;\r
     req.src.uv_addr = (uint32_t)virt_to_phys(src);\r
     req.src.v_addr = (uint32_t)virt_to_phys(src);\r
     req.src.format = 0;\r
 \r
-    req.dst.act_w = 720;\r
-    req.dst.act_h = 480;\r
+    req.dst.act_w = 1280;\r
+    req.dst.act_h = 720;\r
 \r
     req.dst.vir_w = 1280;\r
     req.dst.vir_h = 720;\r
     req.dst.x_offset = 0;\r
     req.dst.y_offset = 0;\r
-    req.dst.yrgb_addr = (uint32_t)virt_to_phys(dst);\r
+    req.dst.yrgb_addr = (uint32_t)virt_to_phys(dst) + 8;\r
 \r
     //req.dst.format = RK_FORMAT_RGB_565;\r
 \r
@@ -1395,8 +1399,8 @@ void rga_test_0(void)
     //req.render_mode = color_fill_mode;\r
     //req.fg_color = 0x80ffffff;\r
 \r
-    req.rotate_mode = 1;\r
-    req.scale_mode = 2;\r
+    //req.rotate_mode = 1;\r
+   // req.scale_mode = 2;\r
 \r
     //req.alpha_rop_flag = 1;\r
     //req.alpha_rop_mode = 0x19;\r
@@ -1405,12 +1409,15 @@ void rga_test_0(void)
     req.sina = 0;\r
     req.cosa = 65536;\r
 \r
-    req.mmu_info.mmu_flag = 0x21;\r
-    req.mmu_info.mmu_en = 1;\r
+    //req.mmu_info.mmu_flag = 0x21;\r
+    //req.mmu_info.mmu_en = 1;\r
+\r
+    printk("src = %.8x\n", req.src.yrgb_addr);\r
+    printk("dst = %.8x\n", req.dst.yrgb_addr);\r
 \r
     rga_blit_sync(&session, &req);\r
     \r
-    #if 1\r
+    #if 0\r
     fb->var.bits_per_pixel = 32;\r
     \r
     fb->var.xres = 1280;\r

diff --git a/drivers/video/rockchip/rga/rga_mmu_info.c b/drivers/video/rockchip/rga/rga_mmu_info.c
index 59474f3696b85526de10790c0c6b07cae8d5a7f7..fc017fe9b748b90f65e7a4116d5e10430cb731c1 100755 (executable)
--- a/drivers/video/rockchip/rga/rga_mmu_info.c
+++ b/drivers/video/rockchip/rga/rga_mmu_info.c
@@ -297,7 +297,7 @@ static int rga_MapUserMemory(struct page **pages,
 \r
                 if (vma)//&& (vma->vm_flags & VM_PFNMAP) )\r
                 {\r
-                    #if 0\r
+                    #if 1\r
                     do\r
                     {\r
                         pte_t       * pte;\r
@@ -310,7 +310,7 @@ static int rga_MapUserMemory(struct page **pages,
 \r
                         if(pgd_val(*pgd) == 0)\r
                         {\r
-                            printk("rga pgd value is zero \n");\r
+                            //printk("rga pgd value is zero \n");\r
                             break;\r
                         }\r
                         \r