Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next
[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / rga / rga_drv.c
index ae966f488a298ae24f4692c17a5941ac1fbabc16..d897c8795619c72816e1115f7a934c8393977b66 100755 (executable)
@@ -27,8 +27,8 @@
 #include <asm/io.h>\r
 #include <linux/irq.h>\r
 #include <linux/interrupt.h>\r
-#include <mach/io.h>\r
-#include <mach/irqs.h>\r
+//#include <mach/io.h>\r
+//#include <mach/irqs.h>\r
 #include <linux/fs.h>\r
 #include <asm/uaccess.h>\r
 #include <linux/miscdevice.h>\r
 #include <linux/fb.h>\r
 #include <linux/wakelock.h>\r
 \r
+#if defined(CONFIG_ION_ROCKCHIP)\r
+#include <linux/rockchip_ion.h>\r
+#endif\r
+\r
+\r
 #include "rga.h"\r
 #include "rga_reg_info.h"\r
 #include "rga_mmu_info.h"\r
 #include "RGA_API.h"\r
 \r
+#define RGA_TEST_CASE 0\r
+\r
 #define RGA_TEST 0\r
 #define RGA_TEST_TIME 0\r
 #define RGA_TEST_FLUSH_TIME 0\r
 \r
 #define RGA_MAJOR              255\r
 \r
-#define RK30_RGA_PHYS  0x10114000\r
-#define RK30_RGA_SIZE  SZ_8K\r
+#if defined(CONFIG_ARCH_RK2928) || defined(CONFIG_ARCH_RK3026)\r
+#define RK30_RGA_PHYS          RK2928_RGA_PHYS\r
+#define RK30_RGA_SIZE          RK2928_RGA_SIZE\r
+#endif\r
 #define RGA_RESET_TIMEOUT      1000\r
 \r
 /* Driver information */\r
 #define DRIVER_DESC            "RGA Device Driver"\r
 #define DRIVER_NAME            "rga"\r
 \r
-#define RGA_VERSION   "1.000"\r
+#define RGA_VERSION   "1.003"\r
 \r
 ktime_t rga_start;\r
 ktime_t rga_end;\r
 \r
-int rga_num = 0;\r
+rga_session rga_session_global;\r
+\r
+long (*rga_ioctl_kernel_p)(struct rga_req *);\r
+\r
 \r
 struct rga_drvdata {\r
        struct miscdevice miscdev;\r
@@ -85,13 +97,23 @@ struct rga_drvdata {
        void (*rga_irq_callback)(int rga_retval);   //callback function used by aync call\r
        struct wake_lock wake_lock;\r
 \r
+    struct clk *pd_rga;\r
        struct clk *aclk_rga;\r
-       struct clk *hclk_rga;\r
-       struct clk *pd_rga;\r
+    struct clk *hclk_rga;\r
+\r
+    //#if defined(CONFIG_ION_ROCKCHIP)\r
+    struct ion_client * ion_client;\r
+    //#endif\r
 };\r
 \r
 static struct rga_drvdata *drvdata;\r
 rga_service_info rga_service;\r
+struct rga_mmu_buf_t rga_mmu_buf;\r
+\r
+\r
+#if defined(CONFIG_ION_ROCKCHIP)\r
+extern struct ion_client *rockchip_ion_client_create(const char * name);\r
+#endif\r
 \r
 static int rga_blit_async(rga_session *session, struct rga_req *req);\r
 static void rga_del_running_list(void);\r
@@ -100,7 +122,7 @@ static void rga_try_set_reg(void);
 \r
 \r
 /* Logging */\r
-#define RGA_DEBUG 0\r
+#define RGA_DEBUG 1\r
 #if RGA_DEBUG\r
 #define DBG(format, args...) printk(KERN_DEBUG "%s: " format, DRIVER_NAME, ## args)\r
 #define ERR(format, args...) printk(KERN_ERR "%s: " format, DRIVER_NAME, ## args)\r
@@ -113,6 +135,32 @@ static void rga_try_set_reg(void);
 #define INFO(format, args...)\r
 #endif\r
 \r
+#if RGA_TEST\r
+static void print_info(struct rga_req *req)\r
+{\r
+    printk("src : yrgb_addr = %.8x, src.uv_addr = %.8x, src.v_addr = %.8x, format = %d\n",\r
+            req->src.yrgb_addr, req->src.uv_addr, req->src.v_addr, req->src.format);\r
+    printk("src : act_w = %d, act_h = %d, vir_w = %d, vir_h = %d\n",\r
+        req->src.act_w, req->src.act_h, req->src.vir_w, req->src.vir_h);\r
+    printk("src : x_off = %.8x y_off = %.8x\n", req->src.x_offset, req->src.y_offset);\r
+\r
+    printk("dst : yrgb_addr = %.8x, dst.uv_addr = %.8x, dst.v_addr = %.8x, format = %d\n",\r
+            req->dst.yrgb_addr, req->dst.uv_addr, req->dst.v_addr, req->dst.format);\r
+    printk("dst : x_off = %.8x y_off = %.8x\n", req->dst.x_offset, req->dst.y_offset);\r
+    printk("dst : act_w = %d, act_h = %d, vir_w = %d, vir_h = %d\n",\r
+        req->dst.act_w, req->dst.act_h, req->dst.vir_w, req->dst.vir_h);\r
+\r
+    printk("clip.xmin = %d, clip.xmax = %d. clip.ymin = %d, clip.ymax = %d\n",\r
+        req->clip.xmin, req->clip.xmax, req->clip.ymin, req->clip.ymax);\r
+\r
+    printk("mmu_flag = %.8x\n", req->mmu_info.mmu_flag);\r
+\r
+    //printk("alpha_rop_flag = %.8x\n", req->alpha_rop_flag);\r
+    //printk("alpha_rop_mode = %.8x\n", req->alpha_rop_mode);\r
+    //printk("PD_mode = %.8x\n", req->PD_mode);\r
+}\r
+#endif\r
+\r
 \r
 static inline void rga_write(u32 b, u32 r)\r
 {\r
@@ -159,6 +207,8 @@ static void rga_dump(void)
     /* Dump waiting list info */\r
     if (!list_empty(&rga_service.waiting))\r
     {\r
+        list_head      *next;\r
+\r
         next = &rga_service.waiting;\r
 \r
         printk("rga_service dump waiting list\n");\r
@@ -179,6 +229,8 @@ static void rga_dump(void)
     {\r
         printk("rga_service dump running list\n");\r
 \r
+        list_head      *next;\r
+\r
         next = &rga_service.running;\r
         do\r
         {\r
@@ -199,26 +251,37 @@ static void rga_dump(void)
                printk("task_running %d\n", running);\r
                list_for_each_entry_safe(reg, reg_tmp, &session->waiting, session_link)\r
         {\r
-                       printk("waiting register set 0x%.8x\n", (unsigned int)reg);\r
+                       printk("waiting register set 0x%.lu\n", (unsigned long)reg);\r
                }\r
                list_for_each_entry_safe(reg, reg_tmp, &session->running, session_link)\r
         {\r
-                       printk("running register set 0x%.8x\n", (unsigned int)reg);\r
+                       printk("running register set 0x%.lu\n", (unsigned long)reg);\r
                }\r
        }\r
 }\r
 \r
+static inline void rga_queue_power_off_work(void)\r
+{\r
+       queue_delayed_work(system_nrt_wq, &drvdata->power_off_work, RGA_POWER_OFF_DELAY);\r
+}\r
+\r
 /* Caller must hold rga_service.lock */\r
 static void rga_power_on(void)\r
 {\r
-       cancel_delayed_work_sync(&drvdata->power_off_work);\r
-       queue_delayed_work(system_nrt_wq, &drvdata->power_off_work, RGA_POWER_OFF_DELAY);\r
+       static ktime_t last;\r
+       ktime_t now = ktime_get();\r
+\r
+       if (ktime_to_ns(ktime_sub(now, last)) > NSEC_PER_SEC) {\r
+               cancel_delayed_work_sync(&drvdata->power_off_work);\r
+               rga_queue_power_off_work();\r
+               last = now;\r
+       }\r
        if (rga_service.enable)\r
                return;\r
 \r
-       clk_enable(drvdata->aclk_rga);\r
-       clk_enable(drvdata->hclk_rga);\r
-       clk_enable(drvdata->pd_rga);\r
+       clk_prepare_enable(drvdata->aclk_rga);\r
+       clk_prepare_enable(drvdata->hclk_rga);\r
+       //clk_prepare_enable(drvdata->pd_rga);\r
        wake_lock(&drvdata->wake_lock);\r
        rga_service.enable = true;\r
 }\r
@@ -240,893 +303,989 @@ static void rga_power_off(void)
                rga_dump();\r
        }\r
 \r
-       clk_disable(drvdata->pd_rga);\r
-       clk_disable(drvdata->aclk_rga);\r
-       clk_disable(drvdata->hclk_rga);\r
+       //clk_disable_unprepare(drvdata->pd_rga);\r
+       clk_disable_unprepare(drvdata->aclk_rga);\r
+       clk_disable_unprepare(drvdata->hclk_rga);\r
        wake_unlock(&drvdata->wake_lock);\r
        rga_service.enable = false;\r
 }\r
 \r
 static void rga_power_off_work(struct work_struct *work)\r
 {\r
-       mutex_lock(&rga_service.lock);\r
-       rga_power_off();\r
-       mutex_unlock(&rga_service.lock);\r
-}\r
-\r
-static int rga_flush(rga_session *session, unsigned long arg)\r
-{\r
-    int ret = 0;\r
-    int ret_timeout;\r
-\r
-    #if RGA_TEST_FLUSH_TIME\r
-    ktime_t start;\r
-    ktime_t end;\r
-    start = ktime_get();\r
-    #endif\r
-\r
-    ret_timeout = wait_event_interruptible_timeout(session->wait, atomic_read(&session->done), RGA_TIMEOUT_DELAY);\r
-\r
-       if (unlikely(ret_timeout < 0)) {\r
-               pr_err("flush pid %d wait task ret %d\n", session->pid, ret);\r
-        mutex_lock(&rga_service.lock);\r
-        rga_del_running_list();\r
-        mutex_unlock(&rga_service.lock);\r
-        ret = -ETIMEDOUT;\r
-       } else if (0 == ret_timeout) {\r
-               pr_err("flush pid %d wait %d task done timeout\n", session->pid, atomic_read(&session->task_running));\r
-        printk("bus  = %.8x\n", rga_read(RGA_INT));\r
-        mutex_lock(&rga_service.lock);\r
-        rga_del_running_list_timeout();\r
-        rga_try_set_reg();\r
-        mutex_unlock(&rga_service.lock);\r
-               ret = -ETIMEDOUT;\r
-       }\r
-\r
-    #if RGA_TEST_FLUSH_TIME\r
-    end = ktime_get();\r
-    end = ktime_sub(end, start);\r
-    printk("one flush wait time %d\n", (int)ktime_to_us(end));\r
-    #endif\r
-\r
-       return ret;\r
-}\r
-\r
-\r
-static int rga_get_result(rga_session *session, unsigned long arg)\r
-{\r
-       //printk("rga_get_result %d\n",drvdata->rga_result);\r
-\r
-    int ret = 0;\r
-\r
-    int num_done;\r
-\r
-    num_done = atomic_read(&session->num_done);\r
-\r
-       if (unlikely(copy_to_user((void __user *)arg, &num_done, sizeof(int)))) {\r
-                       printk("copy_to_user failed\n");\r
-                       ERR("copy_to_user failed\n");\r
-                       ret =  -EFAULT;\r
-               }\r
-       return ret;\r
-}\r
-\r
-\r
-static int rga_check_param(const struct rga_req *req)\r
-{\r
-       /*RGA can support up to 8192*8192 resolution in RGB format,but we limit the image size to 8191*8191 here*/\r
-       //check src width and height\r
-\r
-    if(!((req->render_mode == color_fill_mode) || (req->render_mode == line_point_drawing_mode)))\r
-    {\r
-       if (unlikely((req->src.act_w <= 0) || (req->src.act_w > 8191) || (req->src.act_h <= 0) || (req->src.act_h > 8191)))\r
-        {\r
-               ERR("invalid source resolution act_w = %d, act_h = %d\n", req->src.act_w, req->src.act_h);\r
-               return  -EINVAL;\r
-       }\r
-    }\r
-\r
-    if(!((req->render_mode == color_fill_mode) || (req->render_mode == line_point_drawing_mode)))\r
-    {\r
-       if (unlikely((req->src.vir_w <= 0) || (req->src.vir_w > 8191) || (req->src.vir_h <= 0) || (req->src.vir_h > 8191)))\r
-        {\r
-               ERR("invalid source resolution vir_w = %d, vir_h = %d\n", req->src.vir_w, req->src.vir_h);\r
-               return  -EINVAL;\r
-       }\r
-    }\r
-\r
-       //check dst width and height\r
-       if (unlikely((req->dst.act_w <= 0) || (req->dst.act_w > 2048) || (req->dst.act_h <= 0) || (req->dst.act_h > 2048)))\r
-    {\r
-               ERR("invalid destination resolution act_w = %d, act_h = %d\n", req->dst.act_w, req->dst.act_h);\r
-               return  -EINVAL;\r
-       }\r
-\r
-    if (unlikely((req->dst.vir_w <= 0) || (req->dst.vir_w > 2048) || (req->dst.vir_h <= 0) || (req->dst.vir_h > 2048)))\r
-    {\r
-               ERR("invalid destination resolution vir_w = %d, vir_h = %d\n", req->dst.vir_w, req->dst.vir_h);\r
-               return  -EINVAL;\r
-       }\r
-\r
-       //check src_vir_w\r
-       if(unlikely(req->src.vir_w < req->src.act_w)){\r
-               ERR("invalid src_vir_w act_w = %d, vir_w = %d\n", req->src.act_w, req->src.vir_w);\r
-               return  -EINVAL;\r
-       }\r
-\r
-       //check dst_vir_w\r
-       if(unlikely(req->dst.vir_w < req->dst.act_w)){\r
-               ERR("invalid dst_vir_w act_h = %d, vir_h = %d\n", req->dst.act_w, req->dst.vir_w);\r
-               return  -EINVAL;\r
-       }\r
-\r
-       return 0;\r
-}\r
-\r
-static void rga_copy_reg(struct rga_reg *reg, uint32_t offset)\r
-{\r
-    uint32_t i;\r
-    uint32_t *cmd_buf;\r
-    uint32_t *reg_p;\r
-\r
-    if(atomic_read(&reg->session->task_running) != 0)\r
-    {\r
-        printk(KERN_ERR "task_running is no zero\n");\r
-    }\r
-\r
-    atomic_add(1, &rga_service.cmd_num);\r
-       atomic_add(1, &reg->session->task_running);\r
-\r
-    cmd_buf = (uint32_t *)rga_service.cmd_buff + offset*28;\r
-    reg_p = (uint32_t *)reg->cmd_reg;\r
-\r
-    for(i=0; i<28; i++)\r
-    {\r
-        cmd_buf[i] = reg_p[i];\r
-    }\r
-\r
-    dsb();\r
-}\r
-\r
-\r
-static struct rga_reg * rga_reg_init(rga_session *session, struct rga_req *req)\r
-{\r
-    uint32_t ret;\r
-       struct rga_reg *reg = kzalloc(sizeof(struct rga_reg), GFP_KERNEL);\r
-       if (NULL == reg) {\r
-               pr_err("kmalloc fail in rga_reg_init\n");\r
-               return NULL;\r
-       }\r
-\r
-    reg->session = session;\r
-       INIT_LIST_HEAD(&reg->session_link);\r
-       INIT_LIST_HEAD(&reg->status_link);\r
-\r
-    //memcpy(&reg->req, req, sizeof(struct rga_req));\r
-\r
-    reg->MMU_base = NULL;\r
-\r
-    if (req->mmu_info.mmu_en)\r
-    {\r
-        ret = rga_set_mmu_info(reg, req);\r
-        if(ret < 0)\r
-        {\r
-            printk("%s, [%d] set mmu info error \n", __FUNCTION__, __LINE__);\r
-            if(reg != NULL)\r
-            {\r
-                kfree(reg);\r
-            }\r
-            return NULL;\r
-        }\r
-    }\r
-\r
-    if(RGA_gen_reg_info(req, (uint8_t *)reg->cmd_reg) == -1)\r
-    {\r
-        printk("gen reg info error\n");\r
-        if(reg != NULL)\r
-        {\r
-            kfree(reg);\r
-        }\r
-        return NULL;\r
-    }\r
-\r
-    mutex_lock(&rga_service.lock);\r
-       list_add_tail(&reg->status_link, &rga_service.waiting);\r
-       list_add_tail(&reg->session_link, &session->waiting);\r
-       mutex_unlock(&rga_service.lock);\r
-\r
-    return reg;\r
-}\r
-\r
-static struct rga_reg * rga_reg_init_2(rga_session *session, struct rga_req *req0, struct rga_req *req1)\r
-{\r
-    uint32_t ret;\r
-\r
-    struct rga_reg *reg0, *reg1;\r
-\r
-    reg0 = NULL;\r
-    reg1 = NULL;\r
-\r
-    do\r
-    {\r
-        reg0 = kzalloc(sizeof(struct rga_reg), GFP_KERNEL);\r
-       if (NULL == reg0) {\r
-               pr_err("%s [%d] kmalloc fail in rga_reg_init\n", __FUNCTION__, __LINE__);\r
-            break;\r
-       }\r
-\r
-        reg1 = kzalloc(sizeof(struct rga_reg), GFP_KERNEL);\r
-       if (NULL == reg1) {\r
-               pr_err("%s [%d] kmalloc fail in rga_reg_init\n", __FUNCTION__, __LINE__);\r
-            break;\r
-       }\r
-\r
-        reg0->session = session;\r
-       INIT_LIST_HEAD(&reg0->session_link);\r
-       INIT_LIST_HEAD(&reg0->status_link);\r
-\r
-        reg1->session = session;\r
-        INIT_LIST_HEAD(&reg1->session_link);\r
-       INIT_LIST_HEAD(&reg1->status_link);\r
-\r
-        //memcpy(&reg0->req, req0, sizeof(struct rga_req));\r
-        //memcpy(&reg1->req, req1, sizeof(struct rga_req));\r
-\r
-        if(req0->mmu_info.mmu_en)\r
-        {\r
-            ret = rga_set_mmu_info(reg0, req0);\r
-            if(ret < 0) {\r
-                printk("%s, [%d] set mmu info error \n", __FUNCTION__, __LINE__);\r
-                break;\r
-            }\r
-        }\r
-\r
-        RGA_gen_reg_info(req0, (uint8_t *)reg0->cmd_reg);\r
-\r
-        if(req1->mmu_info.mmu_en)\r
-        {\r
-            ret = rga_set_mmu_info(reg1, req1);\r
-            if(ret < 0) {\r
-                printk("%s, [%d] set mmu info error \n", __FUNCTION__, __LINE__);\r
-                break;\r
-            }\r
-        }\r
-\r
-        RGA_gen_reg_info(req1, (uint8_t *)reg1->cmd_reg);\r
-\r
-        mutex_lock(&rga_service.lock);\r
-       list_add_tail(&reg0->status_link, &rga_service.waiting);\r
-        list_add_tail(&reg0->session_link, &session->waiting);\r
-        list_add_tail(&reg1->status_link, &rga_service.waiting);\r
-       list_add_tail(&reg1->session_link, &session->waiting);\r
-        mutex_unlock(&rga_service.lock);\r
-\r
-        return reg1;\r
-    }\r
-    while(0);\r
-\r
-    if(reg0 != NULL) {\r
-        kfree(reg0);\r
-    }\r
-\r
-    if(reg1 != NULL) {\r
-        kfree(reg1);\r
-    }\r
-\r
-    return NULL;\r
-}\r
-\r
-/* Caller must hold rga_service.lock */\r
-static void rga_reg_deinit(struct rga_reg *reg)\r
-{\r
-       list_del_init(&reg->session_link);\r
-       list_del_init(&reg->status_link);\r
-       kfree(reg);\r
-}\r
-\r
-/* Caller must hold rga_service.lock */\r
-static void rga_reg_from_wait_to_run(struct rga_reg *reg)\r
-{\r
-       list_del_init(&reg->status_link);\r
-       list_add_tail(&reg->status_link, &rga_service.running);\r
-\r
-       list_del_init(&reg->session_link);\r
-       list_add_tail(&reg->session_link, &reg->session->running);\r
-}\r
-\r
-/* Caller must hold rga_service.lock */\r
-static void rga_service_session_clear(rga_session *session)\r
-{\r
-       struct rga_reg *reg, *n;\r
-\r
-    list_for_each_entry_safe(reg, n, &session->waiting, session_link)\r
-    {\r
-               rga_reg_deinit(reg);\r
-       }\r
-\r
-    list_for_each_entry_safe(reg, n, &session->running, session_link)\r
-    {\r
-               rga_reg_deinit(reg);\r
-       }\r
-}\r
-\r
-/* Caller must hold rga_service.lock */\r
-static void rga_try_set_reg(void)\r
-{\r
-    struct rga_reg *reg ;\r
-\r
-    if (list_empty(&rga_service.running))\r
-    {\r
-        if (!list_empty(&rga_service.waiting))\r
-        {\r
-            /* RGA is idle */\r
-            reg = list_entry(rga_service.waiting.next, struct rga_reg, status_link);\r
-\r
-            rga_power_on();\r
-            udelay(3);\r
-\r
-            rga_copy_reg(reg, 0);\r
-            rga_reg_from_wait_to_run(reg);\r
-\r
-            dmac_flush_range(&rga_service.cmd_buff[0], &rga_service.cmd_buff[28]);\r
+       if (mutex_trylock(&rga_service.lock)) {\r
+               rga_power_off();\r
+               mutex_unlock(&rga_service.lock);\r
+       } else {\r
+               /* Come back later if the device is busy... */\r
+
+               rga_queue_power_off_work();
+       }
+}
+
+static int rga_flush(rga_session *session, unsigned long arg)
+{
+    int ret = 0;
+    int ret_timeout;
+
+    #if RGA_TEST_FLUSH_TIME
+    ktime_t start;
+    ktime_t end;
+    start = ktime_get();
+    #endif
+
+    ret_timeout = wait_event_timeout(session->wait, atomic_read(&session->done), RGA_TIMEOUT_DELAY);
+
+       if (unlikely(ret_timeout < 0)) {
+               //pr_err("flush pid %d wait task ret %d\n", session->pid, ret);
+        mutex_lock(&rga_service.lock);
+        rga_del_running_list();
+        mutex_unlock(&rga_service.lock);
+        ret = ret_timeout;
+       } else if (0 == ret_timeout) {
+               //pr_err("flush pid %d wait %d task done timeout\n", session->pid, atomic_read(&session->task_running));
+        //printk("bus  = %.8x\n", rga_read(RGA_INT));
+        mutex_lock(&rga_service.lock);
+        rga_del_running_list_timeout();
+        rga_try_set_reg();
+        mutex_unlock(&rga_service.lock);
+               ret = -ETIMEDOUT;
+       }
+
+    #if RGA_TEST_FLUSH_TIME
+    end = ktime_get();
+    end = ktime_sub(end, start);
+    printk("one flush wait time %d\n", (int)ktime_to_us(end));
+    #endif
+
+       return ret;
+}
+
+
+static int rga_get_result(rga_session *session, unsigned long arg)
+{
+       //printk("rga_get_result %d\n",drvdata->rga_result);
+
+    int ret = 0;
+
+    int num_done;
+
+    num_done = atomic_read(&session->num_done);
+
+       if (unlikely(copy_to_user((void __user *)arg, &num_done, sizeof(int)))) {
+                       printk("copy_to_user failed\n");
+                       ret =  -EFAULT;
+               }
+       return ret;
+}
+
+
+static int rga_check_param(const struct rga_req *req)
+{
+       /*RGA can support up to 8192*8192 resolution in RGB format,but we limit the image size to 8191*8191 here*/
+       //check src width and height
+
+    if(!((req->render_mode == color_fill_mode) || (req->render_mode == line_point_drawing_mode)))
+    {
+       if (unlikely((req->src.act_w <= 0) || (req->src.act_w > 8191) || (req->src.act_h <= 0) || (req->src.act_h > 8191)))
+        {
+               printk("invalid source resolution act_w = %d, act_h = %d\n", req->src.act_w, req->src.act_h);
+               return  -EINVAL;
+       }
+    }
+
+    if(!((req->render_mode == color_fill_mode) || (req->render_mode == line_point_drawing_mode)))
+    {
+       if (unlikely((req->src.vir_w <= 0) || (req->src.vir_w > 8191) || (req->src.vir_h <= 0) || (req->src.vir_h > 8191)))
+        {
+               printk("invalid source resolution vir_w = %d, vir_h = %d\n", req->src.vir_w, req->src.vir_h);
+               return  -EINVAL;
+       }
+    }
+
+       //check dst width and height
+       if (unlikely((req->dst.act_w <= 0) || (req->dst.act_w > 2048) || (req->dst.act_h <= 0) || (req->dst.act_h > 2048)))
+    {
+               printk("invalid destination resolution act_w = %d, act_h = %d\n", req->dst.act_w, req->dst.act_h);
+               return  -EINVAL;
+       }
+
+    if (unlikely((req->dst.vir_w <= 0) || (req->dst.vir_w > 4096) || (req->dst.vir_h <= 0) || (req->dst.vir_h > 2048)))
+    {
+               printk("invalid destination resolution vir_w = %d, vir_h = %d\n", req->dst.vir_w, req->dst.vir_h);
+               return  -EINVAL;
+       }
+
+       //check src_vir_w
+       if(unlikely(req->src.vir_w < req->src.act_w)){
+               printk("invalid src_vir_w act_w = %d, vir_w = %d\n", req->src.act_w, req->src.vir_w);
+               return  -EINVAL;
+       }
+
+       //check dst_vir_w
+       if(unlikely(req->dst.vir_w < req->dst.act_w)){
+        if(req->rotate_mode != 1)
+        {
+                   printk("invalid dst_vir_w act_h = %d, vir_h = %d\n", req->dst.act_w, req->dst.vir_w);
+                   return      -EINVAL;
+        }
+       }
+
+       return 0;
+}
+
+static void rga_copy_reg(struct rga_reg *reg, uint32_t offset)
+{
+    uint32_t i;
+    uint32_t *cmd_buf;
+    uint32_t *reg_p;
+
+    if(atomic_read(&reg->session->task_running) != 0)
+    {
+        printk(KERN_ERR "task_running is no zero\n");
+    }
+
+    atomic_add(1, &rga_service.cmd_num);
+       atomic_add(1, &reg->session->task_running);
+
+    cmd_buf = (uint32_t *)rga_service.cmd_buff + offset*32;
+    reg_p = (uint32_t *)reg->cmd_reg;
+
+    for(i=0; i<32; i++)\r
+        cmd_buf[i] = reg_p[i];
+\r
+}
+
+
+static struct rga_reg * rga_reg_init(rga_session *session, struct rga_req *req)
+{
+    int32_t ret;
+       struct rga_reg *reg = kzalloc(sizeof(struct rga_reg), GFP_KERNEL);
+       if (NULL == reg) {
+               pr_err("kmalloc fail in rga_reg_init\n");
+               return NULL;
+       }
+
+    reg->session = session;
+       INIT_LIST_HEAD(&reg->session_link);
+       INIT_LIST_HEAD(&reg->status_link);
+
+    reg->MMU_base = NULL;
+
+    if (req->mmu_info.mmu_en)
+    {
+        ret = rga_set_mmu_info(reg, req);
+        if(ret < 0)
+        {
+            printk("%s, [%d] set mmu info error \n", __FUNCTION__, __LINE__);
+            if(reg != NULL)
+            {
+                kfree(reg);
+            }
+            return NULL;
+        }
+    }
+
+    if(RGA_gen_reg_info(req, (uint8_t *)reg->cmd_reg) == -1)
+    {
+        printk("gen reg info error\n");
+        if(reg != NULL)
+        {
+            kfree(reg);
+        }
+        return NULL;
+    }
+
+    mutex_lock(&rga_service.lock);
+       list_add_tail(&reg->status_link, &rga_service.waiting);
+       list_add_tail(&reg->session_link, &session->waiting);
+       mutex_unlock(&rga_service.lock);
+
+    return reg;
+}
+
+static struct rga_reg * rga_reg_init_2(rga_session *session, struct rga_req *req0, struct rga_req *req1)
+{
+    int32_t ret;
+
+    struct rga_reg *reg0, *reg1;
+
+    reg0 = NULL;
+    reg1 = NULL;
+
+    do
+    {
+        reg0 = kzalloc(sizeof(struct rga_reg), GFP_KERNEL);
+       if (NULL == reg0) {
+               pr_err("%s [%d] kmalloc fail in rga_reg_init\n", __FUNCTION__, __LINE__);
+            break;
+       }
+
+        reg1 = kzalloc(sizeof(struct rga_reg), GFP_KERNEL);
+       if (NULL == reg1) {
+               pr_err("%s [%d] kmalloc fail in rga_reg_init\n", __FUNCTION__, __LINE__);
+            break;
+       }
+
+        reg0->session = session;
+       INIT_LIST_HEAD(&reg0->session_link);
+       INIT_LIST_HEAD(&reg0->status_link);
+
+        reg1->session = session;
+        INIT_LIST_HEAD(&reg1->session_link);
+       INIT_LIST_HEAD(&reg1->status_link);
+
+        req0->mmu_info.mmu_flag &= (~(1 << 10));
+
+        if(req0->mmu_info.mmu_en)
+        {
+            ret = rga_set_mmu_info(reg0, req0);
+            if(ret < 0) {
+                printk("%s, [%d] set mmu info error \n", __FUNCTION__, __LINE__);
+                break;
+            }
+        }
+
+        RGA_gen_reg_info(req0, (uint8_t *)reg0->cmd_reg);
+
+        req1->mmu_info.mmu_flag &= (~(1 << 8));
+
+        if(req1->mmu_info.mmu_en)
+        {
+            ret = rga_set_mmu_info(reg1, req1);
+            if(ret < 0) {
+                printk("%s, [%d] set mmu info error \n", __FUNCTION__, __LINE__);
+                break;
+            }
+        }
+
+        RGA_gen_reg_info(req1, (uint8_t *)reg1->cmd_reg);
+
+        mutex_lock(&rga_service.lock);
+       list_add_tail(&reg0->status_link, &rga_service.waiting);
+        list_add_tail(&reg0->session_link, &session->waiting);
+        list_add_tail(&reg1->status_link, &rga_service.waiting);
+       list_add_tail(&reg1->session_link, &session->waiting);
+        mutex_unlock(&rga_service.lock);
+
+        return reg1;
+    }
+    while(0);
+
+    if(reg0 != NULL) {
+        kfree(reg0);
+    }
+
+    if(reg1 != NULL) {
+        kfree(reg1);
+    }
+
+    return NULL;
+}
+
+/* Caller must hold rga_service.lock */
+static void rga_reg_deinit(struct rga_reg *reg)
+{
+       list_del_init(&reg->session_link);
+       list_del_init(&reg->status_link);
+       kfree(reg);
+}
+
+/* Caller must hold rga_service.lock */
+static void rga_reg_from_wait_to_run(struct rga_reg *reg)
+{
+       list_del_init(&reg->status_link);
+       list_add_tail(&reg->status_link, &rga_service.running);
+
+       list_del_init(&reg->session_link);
+       list_add_tail(&reg->session_link, &reg->session->running);
+}
+
+/* Caller must hold rga_service.lock */
+static void rga_service_session_clear(rga_session *session)
+{
+       struct rga_reg *reg, *n;
+
+    list_for_each_entry_safe(reg, n, &session->waiting, session_link)
+    {
+               rga_reg_deinit(reg);
+       }
+
+    list_for_each_entry_safe(reg, n, &session->running, session_link)
+    {
+               rga_reg_deinit(reg);
+       }
+}
+
+/* Caller must hold rga_service.lock */
+static void rga_try_set_reg(void)
+{
+    struct rga_reg *reg ;
+
+    if (list_empty(&rga_service.running))
+    {
+        if (!list_empty(&rga_service.waiting))
+        {
+            /* RGA is idle */
+            reg = list_entry(rga_service.waiting.next, struct rga_reg, status_link);
+
+            rga_power_on();
+            udelay(1);
+
+            rga_copy_reg(reg, 0);
+            rga_reg_from_wait_to_run(reg);
+\r
+            #ifdef CONFIG_ARM\r
+            dmac_flush_range(&rga_service.cmd_buff[0], &rga_service.cmd_buff[28]);
             outer_flush_range(virt_to_phys(&rga_service.cmd_buff[0]),virt_to_phys(&rga_service.cmd_buff[28]));\r
-\r
-            rga_soft_reset();\r
-            rga_write(0, RGA_MMU_CTRL);\r
-\r
-            /* CMD buff */\r
-            rga_write(virt_to_phys(rga_service.cmd_buff), RGA_CMD_ADDR);\r
-\r
-#if RGA_TEST\r
-            {\r
-                //printk(KERN_DEBUG "cmd_addr = %.8x\n", rga_read(RGA_CMD_ADDR));\r
-                uint32_t i;\r
-                uint32_t *p;\r
-                p = rga_service.cmd_buff;\r
-                printk(KERN_DEBUG "CMD_REG\n");\r
-                for (i=0; i<7; i++)\r
-                    printk("%.8x %.8x %.8x %.8x\n", p[0 + i*4], p[1+i*4], p[2 + i*4], p[3 + i*4]);\r
-            }\r
-#endif\r
-\r
-            /* master mode */\r
-            rga_write((0x1<<2)|(0x1<<3), RGA_SYS_CTRL);\r
-\r
-            /* All CMD finish int */\r
-            rga_write(rga_read(RGA_INT)|(0x1<<10)|(0x1<<8), RGA_INT);\r
-\r
-            /* Start proc */\r
-            atomic_set(&reg->session->done, 0);\r
-            rga_write(0x1, RGA_CMD_CTRL);\r
-\r
-#if RGA_TEST\r
-            {\r
-                uint32_t i;\r
-                printk(KERN_DEBUG "CMD_READ_BACK_REG\n");\r
-                for (i=0; i<7; i++)\r
-                    printk(KERN_DEBUG "%.8x %.8x %.8x %.8x\n", rga_read(0x100 + i*16 + 0),\r
-                            rga_read(0x100 + i*16 + 4), rga_read(0x100 + i*16 + 8), rga_read(0x100 + i*16 + 12));\r
-            }\r
-#endif\r
-        }\r
-        else\r
-        {\r
-//          rga_power_off();\r
-        }\r
-    }\r
-}\r
-\r
-\r
-#if RGA_TEST\r
-static void print_info(struct rga_req *req)\r
-{\r
-    printk("src.yrgb_addr = %.8x, src.uv_addr = %.8x, src.v_addr = %.8x\n",\r
-            req->src.yrgb_addr, req->src.uv_addr, req->src.v_addr);\r
-    printk("src : act_w = %d, act_h = %d, vir_w = %d, vir_h = %d\n",\r
-        req->src.act_w, req->src.act_h, req->src.vir_w, req->src.vir_h);\r
-    printk("src : x_offset = %.8x y_offset = %.8x\n", req->src.x_offset, req->src.y_offset);\r
-\r
-    printk("dst.yrgb_addr = %.8x, dst.uv_addr = %.8x, dst.v_addr = %.8x\n",\r
-            req->dst.yrgb_addr, req->dst.uv_addr, req->dst.v_addr);\r
-    printk("dst : x_offset = %.8x y_offset = %.8x\n", req->dst.x_offset, req->dst.y_offset);\r
-    printk("dst : act_w = %d, act_h = %d, vir_w = %d, vir_h = %d\n",\r
-        req->dst.act_w, req->dst.act_h, req->dst.vir_w, req->dst.vir_h);\r
-\r
-    printk("clip.xmin = %d, clip.xmax = %d. clip.ymin = %d, clip.ymax = %d\n",\r
-        req->clip.xmin, req->clip.xmax, req->clip.ymin, req->clip.ymax);\r
-}\r
-#endif\r
-\r
-/* Caller must hold rga_service.lock */\r
-static void rga_del_running_list(void)\r
-{\r
-    struct rga_reg *reg;\r
-\r
-    while(!list_empty(&rga_service.running))\r
-    {\r
-        reg = list_entry(rga_service.running.next, struct rga_reg, status_link);\r
-\r
-        if(reg->MMU_base != NULL)\r
-        {\r
-            kfree(reg->MMU_base);\r
-            reg->MMU_base = NULL;\r
-        }\r
-        atomic_sub(1, &reg->session->task_running);\r
-        atomic_sub(1, &rga_service.total_running);\r
-\r
-        if(list_empty(&reg->session->waiting))\r
-        {\r
-            atomic_set(&reg->session->done, 1);\r
-            wake_up_interruptible_sync(&reg->session->wait);\r
-        }\r
-\r
-        rga_reg_deinit(reg);\r
-    }\r
-}\r
-\r
-/* Caller must hold rga_service.lock */\r
-static void rga_del_running_list_timeout(void)\r
-{\r
-    struct rga_reg *reg;\r
-\r
-    while(!list_empty(&rga_service.running))\r
-    {\r
-        reg = list_entry(rga_service.running.next, struct rga_reg, status_link);\r
-\r
-        if(reg->MMU_base != NULL)\r
-        {\r
-            kfree(reg->MMU_base);\r
-        }\r
-\r
-        atomic_sub(1, &reg->session->task_running);\r
-        atomic_sub(1, &rga_service.total_running);\r
-\r
-\r
-        #if 0\r
-        printk("RGA_INT is %.8x\n", rga_read(RGA_INT));\r
-        printk("reg->session->task_running = %d\n", atomic_read(&reg->session->task_running));\r
-        printk("rga_service.total_running  = %d\n", atomic_read(&rga_service.total_running));\r
-\r
-        print_info(&reg->req);\r
-\r
-        {\r
-            uint32_t *p, i;\r
-            p = reg->cmd_reg;\r
-            for (i=0; i<7; i++)\r
-                printk("%.8x %.8x %.8x %.8x\n", p[0 + i*4], p[1+i*4], p[2 + i*4], p[3 + i*4]);\r
-\r
-        }\r
-        #endif\r
-\r
-        if(list_empty(&reg->session->waiting))\r
-        {\r
-            atomic_set(&reg->session->done, 1);\r
-            wake_up_interruptible_sync(&reg->session->wait);\r
-        }\r
-\r
-        rga_reg_deinit(reg);\r
-    }\r
-}\r
-\r
-\r
-static void rga_mem_addr_sel(struct rga_req *req)\r
-{\r
-    switch(req->src.format)\r
-    {\r
-        case RK_FORMAT_YCbCr_422_SP:\r
-            break;\r
-        case RK_FORMAT_YCbCr_422_P :\r
-            break;\r
-        case RK_FORMAT_YCbCr_420_SP :\r
-            if((req->src.yrgb_addr > 0xc0000000) && (req->src.uv_addr > 0xc0000000)\r
-                && (req->dst.yrgb_addr > 0xc0000000))\r
-            {\r
-                req->src.yrgb_addr = req->src.yrgb_addr - 0x60000000;\r
-                req->src.uv_addr = req->src.uv_addr - 0x60000000;\r
-                req->dst.yrgb_addr = req->dst.yrgb_addr - 0x60000000;\r
-                req->mmu_info.mmu_en = 0;\r
-                req->mmu_info.mmu_flag &= 0xfffe;\r
-            }\r
-            break;\r
-        case RK_FORMAT_YCbCr_420_P :\r
-            break;\r
-        case RK_FORMAT_YCrCb_422_SP :\r
-            break;\r
-        case RK_FORMAT_YCrCb_422_P :\r
-            break;\r
-        case RK_FORMAT_YCrCb_420_SP :\r
-            break;\r
-        case RK_FORMAT_YCrCb_420_P :\r
-            break;\r
-        default :\r
-            break;\r
-    }\r
-\r
-}\r
-\r
-\r
-static int rga_blit(rga_session *session, struct rga_req *req)\r
-{\r
-    int ret = -1;\r
-    int num = 0;\r
-    struct rga_reg *reg;\r
-    struct rga_req *req2;\r
-\r
-    uint32_t saw, sah, daw, dah;\r
-\r
-    req2 = NULL;\r
-\r
-    saw = req->src.act_w;\r
-    sah = req->src.act_h;\r
-    daw = req->dst.act_w;\r
-    dah = req->dst.act_h;\r
-\r
-    do\r
-    {\r
-        if((req->render_mode == bitblt_mode) && (((saw>>1) >= daw) || ((sah>>1) >= dah)))\r
-        {\r
-            /* generate 2 cmd for pre scale */\r
-            req2 = kzalloc(sizeof(struct rga_req), GFP_KERNEL);\r
-            if(NULL == req2) {\r
-                return -EFAULT;\r
-            }\r
-\r
-            ret = rga_check_param(req);\r
-               if(ret == -EINVAL) {\r
-                printk("req 0 argument is inval\n");\r
-                break;\r
-               }\r
-\r
-            ret = RGA_gen_two_pro(req, req2);\r
-            if(ret == -EINVAL) {\r
-                break;\r
-            }\r
-\r
-            ret = rga_check_param(req);\r
-               if(ret == -EINVAL) {\r
-                printk("req 1 argument is inval\n");\r
-                break;\r
-               }\r
-\r
-            ret = rga_check_param(req2);\r
-               if(ret == -EINVAL) {\r
-                printk("req 2 argument is inval\n");\r
-                break;\r
-               }\r
-\r
-            reg = rga_reg_init_2(session, req, req2);\r
-            if(reg == NULL) {\r
-                break;\r
-            }\r
-            num = 2;\r
-\r
-            if(NULL != req2)\r
-            {\r
-                kfree(req2);\r
-            }\r
-        }\r
-        else\r
-        {\r
-            /* check value if legal */\r
-            ret = rga_check_param(req);\r
-               if(ret == -EINVAL) {\r
-                printk("req argument is inval\n");\r
-                break;\r
-               }\r
-\r
-            if(req->render_mode == bitblt_mode)\r
-            {\r
-                rga_mem_addr_sel(req);\r
-            }\r
-\r
-            reg = rga_reg_init(session, req);\r
-            if(reg == NULL) {\r
-                break;\r
-            }\r
-            num = 1;\r
-        }\r
-\r
-        mutex_lock(&rga_service.lock);\r
-        atomic_add(num, &rga_service.total_running);\r
-        rga_try_set_reg();\r
-        mutex_unlock(&rga_service.lock);\r
-\r
-        return 0;\r
-    }\r
-    while(0);\r
-\r
-    if(NULL != req2)\r
-    {\r
-        kfree(req2);\r
-    }\r
-\r
-    return -EFAULT;\r
-}\r
-\r
-static int rga_blit_async(rga_session *session, struct rga_req *req)\r
-{\r
-       int ret = -1;\r
-\r
-    #if RGA_TEST\r
-    printk("*** rga_blit_async proc ***\n");\r
-    print_info(req);\r
-    #endif\r
-\r
-    ret = rga_blit(session, req);\r
-\r
-    return ret;\r
-}\r
-\r
-static int rga_blit_sync(rga_session *session, struct rga_req *req)\r
-{\r
-    int ret = -1;\r
-    int ret_timeout = 0;\r
-\r
-    #if RGA_TEST\r
-    printk("*** rga_blit_sync proc ***\n");\r
-    print_info(req);\r
+            #elif defined(CONFIG_ARM64)\r
+            __dma_flush_range(&rga_service.cmd_buff[0], &rga_service.cmd_buff[28]);\r
+            #endif\r
+
+            #if 1 
+            rga_soft_reset();
+            #endif
+
+            rga_write(0x0, RGA_SYS_CTRL);
+            rga_write(0, RGA_MMU_CTRL);
+
+            /* CMD buff */
+            rga_write(virt_to_phys(rga_service.cmd_buff), RGA_CMD_ADDR);
+
+#if RGA_TEST
+            {
+                //printk(KERN_DEBUG "cmd_addr = %.8x\n", rga_read(RGA_CMD_ADDR));
+                uint32_t i;
+                uint32_t *p;
+                p = rga_service.cmd_buff;
+                printk("CMD_REG\n");
+                for (i=0; i<7; i++)
+                    printk("%.8x %.8x %.8x %.8x\n", p[0 + i*4], p[1+i*4], p[2 + i*4], p[3 + i*4]);
+                printk("%.8x %.8x\n", p[0 + i*4], p[1+i*4]);
+            }
+#endif
+
+            /* master mode */
+            rga_write((0x1<<2)|(0x1<<3), RGA_SYS_CTRL);
+
+            /* All CMD finish int */
+            rga_write(rga_read(RGA_INT)|(0x1<<10)|(0x1<<8), RGA_INT);
+
+            #if RGA_TEST_TIME
+            rga_start = ktime_get();
+            #endif
+
+            /* Start proc */
+            atomic_set(&reg->session->done, 0);
+            rga_write(0x1, RGA_CMD_CTRL);
+
+#if RGA_TEST
+            {
+                uint32_t i;
+                printk("CMD_READ_BACK_REG\n");
+                for (i=0; i<7; i++)
+                    printk("%.8x %.8x %.8x %.8x\n", rga_read(0x100 + i*16 + 0),
+                            rga_read(0x100 + i*16 + 4), rga_read(0x100 + i*16 + 8), rga_read(0x100 + i*16 + 12));
+                printk("%.8x %.8x\n", rga_read(0x100 + i*16 + 0), rga_read(0x100 + i*16 + 4));
+            }
+#endif
+        }
+    }
+}
+
+
+
+
+/* Caller must hold rga_service.lock */
+static void rga_del_running_list(void)
+{
+    struct rga_reg *reg;
+
+    while(!list_empty(&rga_service.running))
+    {
+        reg = list_entry(rga_service.running.next, struct rga_reg, status_link);
+
+        if(reg->MMU_len != 0)
+        {
+            if (rga_mmu_buf.back + reg->MMU_len > 2*rga_mmu_buf.size)
+                rga_mmu_buf.back = reg->MMU_len + rga_mmu_buf.size;
+            else
+                rga_mmu_buf.back += reg->MMU_len;
+        }
+
+        atomic_sub(1, &reg->session->task_running);
+        atomic_sub(1, &rga_service.total_running);
+
+        if(list_empty(&reg->session->waiting))
+        {
+            atomic_set(&reg->session->done, 1);
+            wake_up(&reg->session->wait);
+        }
+
+        rga_reg_deinit(reg);
+    }
+}
+
+/* Caller must hold rga_service.lock */
+static void rga_del_running_list_timeout(void)
+{
+    struct rga_reg *reg;
+
+    while(!list_empty(&rga_service.running))
+    {
+        reg = list_entry(rga_service.running.next, struct rga_reg, status_link);
+
+        if(reg->MMU_base != NULL)
+        {
+            kfree(reg->MMU_base);
+        }
+
+        atomic_sub(1, &reg->session->task_running);
+        atomic_sub(1, &rga_service.total_running);
+
+        //printk("RGA soft reset for timeout process\n");
+        rga_soft_reset();
+
+
+        #if 0
+        printk("RGA_INT is %.8x\n", rga_read(RGA_INT));
+        printk("reg->session->task_running = %d\n", atomic_read(&reg->session->task_running));
+        printk("rga_service.total_running  = %d\n", atomic_read(&rga_service.total_running));
+
+        print_info(&reg->req);
+
+        {
+            uint32_t *p, i;
+            p = reg->cmd_reg;
+            for (i=0; i<7; i++)
+                printk("%.8x %.8x %.8x %.8x\n", p[0 + i*4], p[1+i*4], p[2 + i*4], p[3 + i*4]);
+
+        }
+        #endif
+
+        if(list_empty(&reg->session->waiting))
+        {
+            atomic_set(&reg->session->done, 1);
+            wake_up(&reg->session->wait);
+        }
+
+        rga_reg_deinit(reg);
+    }
+}
+
+
+static void rga_mem_addr_sel(struct rga_req *req)
+{
+    switch(req->src.format)
+    {
+        case RK_FORMAT_YCbCr_422_SP:
+            break;
+        case RK_FORMAT_YCbCr_422_P :
+            break;
+        case RK_FORMAT_YCbCr_420_SP :
+            if((req->src.yrgb_addr > 0xc0000000) && (req->src.uv_addr > 0xc0000000)
+                && (req->dst.yrgb_addr > 0xc0000000))
+            {
+                req->src.yrgb_addr = req->src.yrgb_addr - 0x60000000;
+                req->src.uv_addr = req->src.uv_addr - 0x60000000;
+                req->dst.yrgb_addr = req->dst.yrgb_addr - 0x60000000;
+                req->mmu_info.mmu_en = 0;
+                req->mmu_info.mmu_flag &= 0xfffe;
+            }
+            break;
+        case RK_FORMAT_YCbCr_420_P :
+            break;
+        case RK_FORMAT_YCrCb_422_SP :
+            break;
+        case RK_FORMAT_YCrCb_422_P :
+            break;
+        case RK_FORMAT_YCrCb_420_SP :
+            break;
+        case RK_FORMAT_YCrCb_420_P :
+            break;
+        default :
+            break;
+    }
+
+}
+
+static int rga_convert_dma_buf(struct rga_req *req)
+{
+       struct ion_handle *hdl;
+       ion_phys_addr_t phy_addr;
+       size_t len;
+    int ret;
+    uint32_t src_offset, dst_offset;
+
+    req->sg_src  = NULL;
+    req->sg_dst  = NULL;
+\r
+         src_offset = req->line_draw_info.flag;
+         dst_offset = req->line_draw_info.line_width;
+
+    if(req->src.yrgb_addr) {
+        hdl = ion_import_dma_buf(drvdata->ion_client, req->src.yrgb_addr);
+        if (IS_ERR(hdl)) {
+            ret = PTR_ERR(hdl);
+            printk("RGA2 ERROR ion buf handle\n");
+            return ret;
+        }
+        if ((req->mmu_info.mmu_flag >> 8) & 1) {
+            req->sg_src = ion_sg_table(drvdata->ion_client, hdl);
+            req->src.yrgb_addr = req->src.uv_addr;
+            req->src.uv_addr = req->src.yrgb_addr + (req->src.vir_w * req->src.vir_h);
+            req->src.v_addr = req->src.uv_addr + (req->src.vir_w * req->src.vir_h)/4;
+        }
+        else {
+            ion_phys(drvdata->ion_client, hdl, &phy_addr, &len);
+            req->src.yrgb_addr = phy_addr + src_offset;
+            req->src.uv_addr = req->src.yrgb_addr + (req->src.vir_w * req->src.vir_h);
+            req->src.v_addr = req->src.uv_addr + (req->src.vir_w * req->src.vir_h)/4;
+        }
+        ion_free(drvdata->ion_client, hdl);
+    }
+    else {
+        req->src.yrgb_addr = req->src.uv_addr;
+        req->src.uv_addr = req->src.yrgb_addr + (req->src.vir_w * req->src.vir_h);
+        req->src.v_addr = req->src.uv_addr + (req->src.vir_w * req->src.vir_h)/4;
+    }
+
+    if(req->dst.yrgb_addr) {
+        hdl = ion_import_dma_buf(drvdata->ion_client, req->dst.yrgb_addr);
+        if (IS_ERR(hdl)) {
+            ret = PTR_ERR(hdl);
+            printk("RGA2 ERROR ion buf handle\n");
+            return ret;
+        }
+        if ((req->mmu_info.mmu_flag >> 10) & 1) {
+            req->sg_dst = ion_sg_table(drvdata->ion_client, hdl);
+            req->dst.yrgb_addr = req->dst.uv_addr;
+            req->dst.uv_addr = req->dst.yrgb_addr + (req->dst.vir_w * req->dst.vir_h);
+            req->dst.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;
+        }
+        else {
+            ion_phys(drvdata->ion_client, hdl, &phy_addr, &len);
+            req->dst.yrgb_addr = phy_addr + dst_offset;
+            req->dst.uv_addr = req->dst.yrgb_addr + (req->dst.vir_w * req->dst.vir_h);
+            req->dst.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;
+        }
+        ion_free(drvdata->ion_client, hdl);
+    }
+    else {
+        req->dst.yrgb_addr = req->dst.uv_addr;
+        req->dst.uv_addr = req->dst.yrgb_addr + (req->dst.vir_w * req->dst.vir_h);
+        req->dst.v_addr = req->dst.uv_addr + (req->dst.vir_w * req->dst.vir_h)/4;
+    }
+
+    return 0;
+}
+
+
+static int rga_blit(rga_session *session, struct rga_req *req)
+{
+    int ret = -1;
+    int num = 0;
+    struct rga_reg *reg;
+    struct rga_req req2;
+
+    uint32_t saw, sah, daw, dah;
+
+    saw = req->src.act_w;
+    sah = req->src.act_h;
+    daw = req->dst.act_w;
+    dah = req->dst.act_h;
+
+    #if RGA_TEST
+    print_info(req);
+    #endif
+
+    if(rga_convert_dma_buf(req)) {
+        printk("RGA : DMA buf copy error\n");
+        return -EFAULT;
+    }
+
+    do {
+        if((req->render_mode == bitblt_mode) && (((saw>>1) >= daw) || ((sah>>1) >= dah))) {
+            /* generate 2 cmd for pre scale */
+
+            ret = rga_check_param(req);
+               if(ret == -EINVAL) {
+                printk("req 0 argument is inval\n");
+                break;
+               }
+
+            ret = RGA_gen_two_pro(req, &req2);
+            if(ret == -EINVAL) {
+                break;
+            }
+
+            ret = rga_check_param(req);
+               if(ret == -EINVAL) {
+                printk("req 1 argument is inval\n");
+                break;
+               }
+
+            ret = rga_check_param(&req2);
+               if(ret == -EINVAL) {
+                printk("req 2 argument is inval\n");
+                break;
+               }
+
+            reg = rga_reg_init_2(session, req, &req2);
+            if(reg == NULL) {
+                break;
+            }
+            num = 2;
+
+        }
+        else {
+            /* check value if legal */
+            ret = rga_check_param(req);
+               if(ret == -EINVAL) {
+                printk("req argument is inval\n");
+                break;
+               }
+
+            if(req->render_mode == bitblt_mode)
+                rga_mem_addr_sel(req);
+
+            reg = rga_reg_init(session, req);
+            if(reg == NULL) {
+                break;
+            }
+            num = 1;
+        }
+
+        mutex_lock(&rga_service.lock);
+        atomic_add(num, &rga_service.total_running);
+        rga_try_set_reg();
+        mutex_unlock(&rga_service.lock);
+
+        return 0;
+    }
+    while(0);
+
+    return -EFAULT;
+}
+
+static int rga_blit_async(rga_session *session, struct rga_req *req)
+{
+       int ret = -1;
+
+    #if RGA_TEST
+    printk("*** rga_blit_async proc ***\n");
+    #endif
+
+    atomic_set(&session->done, 0);
+    ret = rga_blit(session, req);
+    return ret;
+}
+
+static int rga_blit_sync(rga_session *session, struct rga_req *req)
+{
+    int ret = -1;
+    int ret_timeout = 0;
+
+    #if RGA_TEST
+    printk("*** rga_blit_sync proc ***\n");
+    #endif
+
+    atomic_set(&session->done, 0);
+    ret = rga_blit(session, req);
+    if(ret < 0)
+        return ret;
+
+    ret_timeout = wait_event_timeout(session->wait, atomic_read(&session->done), RGA_TIMEOUT_DELAY);
+
+    if (unlikely(ret_timeout< 0)) {
+        mutex_lock(&rga_service.lock);
+        rga_del_running_list();
+        mutex_unlock(&rga_service.lock);
+        ret = ret_timeout;
+       }
+    else if (0 == ret_timeout) {
+        mutex_lock(&rga_service.lock);
+        rga_del_running_list_timeout();
+        rga_try_set_reg();
+        mutex_unlock(&rga_service.lock);
+               ret = -ETIMEDOUT;
+       }
+
+    #if RGA_TEST_TIME
+    rga_end = ktime_get();
+    rga_end = ktime_sub(rga_end, rga_start);
+    printk("sync one cmd end time %d\n", (int)ktime_to_us(rga_end));
+    #endif
+
+    return ret;
+}
+
+
+static long rga_ioctl(struct file *file, uint32_t cmd, unsigned long arg)
+{
+    struct rga_req req;
+       int ret = 0;
+    rga_session *session;
+
+    mutex_lock(&rga_service.mutex);
+
+    session = (rga_session *)file->private_data;
+
+       if (NULL == session) {
+        printk("%s [%d] rga thread session is null\n",__FUNCTION__,__LINE__);
+        mutex_unlock(&rga_service.mutex);
+               return -EINVAL;
+       }
+
+    memset(&req, 0x0, sizeof(req));
+
+       switch (cmd) {
+               case RGA_BLIT_SYNC:
+               if (unlikely(copy_from_user(&req, (struct rga_req*)arg, sizeof(struct rga_req))))
+            {
+                       ERR("copy_from_user failed\n");
+                       ret = -EFAULT;
+                break;
+               }
+            ret = rga_blit_sync(session, &req);
+            break;
+               case RGA_BLIT_ASYNC:
+               if (unlikely(copy_from_user(&req, (struct rga_req*)arg, sizeof(struct rga_req))))
+            {
+                       ERR("copy_from_user failed\n");
+                       ret = -EFAULT;
+                break;
+               }
+
+            if((atomic_read(&rga_service.total_running) > 16))
+            {
+                           ret = rga_blit_sync(session, &req);
+            }
+            else
+            {
+                ret = rga_blit_async(session, &req);
+            }
+                       break;
+               case RGA_FLUSH:
+                       ret = rga_flush(session, arg);
+                       break;
+        case RGA_GET_RESULT:
+            ret = rga_get_result(session, arg);
+            break;
+        case RGA_GET_VERSION:
+            ret = copy_to_user((void *)arg, RGA_VERSION, sizeof(RGA_VERSION));
+            //ret = 0;
+            break;
+               default:
+                       ERR("unknown ioctl cmd!\n");
+                       ret = -EINVAL;
+                       break;
+       }
+
+       mutex_unlock(&rga_service.mutex);
+
+       return ret;
+}
+
+
+long rga_ioctl_kernel(struct rga_req *req)
+{
+       int ret = 0;
+    if (!rga_ioctl_kernel_p) {
+        printk("rga_ioctl_kernel_p is NULL\n");
+        return -1;
+    }
+    else {
+        ret = (*rga_ioctl_kernel_p)(req);
+           return ret;
+    }
+}
+
+
+long rga_ioctl_kernel_imp(struct rga_req *req)
+{
+       int ret = 0;
+    rga_session *session;
+
+    mutex_lock(&rga_service.mutex);
+
+    session = &rga_session_global;
+
+       if (NULL == session) {
+        printk("%s [%d] rga thread session is null\n",__FUNCTION__,__LINE__);
+        mutex_unlock(&rga_service.mutex);
+               return -EINVAL;
+       }
+
+    ret = rga_blit_sync(session, req);
+
+       mutex_unlock(&rga_service.mutex);
+
+       return ret;
+}
+
+
+static int rga_open(struct inode *inode, struct file *file)
+{
+    rga_session *session = kzalloc(sizeof(rga_session), GFP_KERNEL);
+       if (NULL == session) {
+               pr_err("unable to allocate memory for rga_session.");
+               return -ENOMEM;
+       }
+
+       session->pid = current->pid;
+    //printk(KERN_DEBUG  "+");
+
+       INIT_LIST_HEAD(&session->waiting);
+       INIT_LIST_HEAD(&session->running);
+       INIT_LIST_HEAD(&session->list_session);
+       init_waitqueue_head(&session->wait);
+       mutex_lock(&rga_service.lock);
+       list_add_tail(&session->list_session, &rga_service.session);
+       mutex_unlock(&rga_service.lock);
+       atomic_set(&session->task_running, 0);
+    atomic_set(&session->num_done, 0);
+
+       file->private_data = (void *)session;
+
+    //DBG("*** rga dev opened by pid %d *** \n", session->pid);
+       return nonseekable_open(inode, file);
+
+}
+
+static int rga_release(struct inode *inode, struct file *file)
+{
+    int task_running;
+       rga_session *session = (rga_session *)file->private_data;
+       if (NULL == session)
+               return -EINVAL;
+    //printk(KERN_DEBUG  "-");
+       task_running = atomic_read(&session->task_running);
+
+    if (task_running)
+    {
+               pr_err("rga_service session %d still has %d task running when closing\n", session->pid, task_running);
+               msleep(100);
+        /*ͬ²½*/
+       }
+
+       wake_up(&session->wait);
+       mutex_lock(&rga_service.lock);
+       list_del(&session->list_session);
+       rga_service_session_clear(session);
+       kfree(session);
+       mutex_unlock(&rga_service.lock);
+
+    //DBG("*** rga dev close ***\n");
+       return 0;
+}
+
+static irqreturn_t rga_irq_thread(int irq, void *dev_id)
+{
+       mutex_lock(&rga_service.lock);
+       if (rga_service.enable) {
+               rga_del_running_list();
+               rga_try_set_reg();
+       }
+       mutex_unlock(&rga_service.lock);
+
+       return IRQ_HANDLED;
+}
+
+static irqreturn_t rga_irq(int irq,  void *dev_id)
+{
+       /*clear INT */
+       rga_write(rga_read(RGA_INT) | (0x1<<6) | (0x1<<7) | (0x1<<4), RGA_INT);
+
+       return IRQ_WAKE_THREAD;
+}
+
+struct file_operations rga_fops = {
+       .owner          = THIS_MODULE,
+       .open           = rga_open,
+       .release        = rga_release,
+       .unlocked_ioctl         = rga_ioctl,
+};
+
+static struct miscdevice rga_dev ={
+    .minor = RGA_MAJOR,
+    .name  = "rga",
+    .fops  = &rga_fops,
+};
+
+
+#if defined(CONFIG_OF)
+static const struct of_device_id rockchip_rga_dt_ids[] = {
+       { .compatible = "rockchip,rk312x-rga", },
+       {},
+};
+#endif
+
+static int rga_drv_probe(struct platform_device *pdev)
+{
+       struct rga_drvdata *data;
+    struct resource *res;
+    //struct device_node *np = pdev->dev.of_node;
+       int ret = 0;
+
+       mutex_init(&rga_service.lock);
+       mutex_init(&rga_service.mutex);
+       atomic_set(&rga_service.total_running, 0);
+       rga_service.enable = false;
+
+    rga_ioctl_kernel_p = rga_ioctl_kernel_imp;
+
+       data = devm_kzalloc(&pdev->dev, sizeof(struct rga_drvdata), GFP_KERNEL);
+       if(! data) {
+               ERR("failed to allocate driver data.\n");
+               return -ENOMEM;
+       }
+
+       INIT_DELAYED_WORK(&data->power_off_work, rga_power_off_work);
+       wake_lock_init(&data->wake_lock, WAKE_LOCK_SUSPEND, "rga");
+
+       //data->pd_rga = devm_clk_get(&pdev->dev, "pd_rga");
+    data->aclk_rga = devm_clk_get(&pdev->dev, "aclk_rga");
+    data->hclk_rga = devm_clk_get(&pdev->dev, "hclk_rga");
+
+    /* map the registers */
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       data->rga_base = devm_ioremap_resource(&pdev->dev, res);
+       if (!data->rga_base) {
+               ERR("rga ioremap failed\n");
+               ret = -ENOENT;
+               goto err_ioremap;
+       }
+
+       /* get the IRQ */
+       data->irq = ret = platform_get_irq(pdev, 0);
+       if (ret <= 0) {
+               ERR("failed to get rga irq resource (%d).\n", data->irq);
+               ret = data->irq;
+               goto err_irq;
+       }
+
+       /* request the IRQ */
+       //ret = request_threaded_irq(data->irq, rga_irq, rga_irq_thread, 0, "rga", pdev);
+    ret = devm_request_threaded_irq(&pdev->dev, data->irq, rga_irq, rga_irq_thread, 0, "rga", data);
+       if (ret)
+       {
+               ERR("rga request_irq failed (%d).\n", ret);
+               goto err_irq;
+       }
+
+       platform_set_drvdata(pdev, data);
+       drvdata = data;
+
+    #if defined(CONFIG_ION_ROCKCHIP)
+       data->ion_client = rockchip_ion_client_create("rga");
+       if (IS_ERR(data->ion_client)) {
+               dev_err(&pdev->dev, "failed to create ion client for rga");
+               return PTR_ERR(data->ion_client);
+       } else {
+               dev_info(&pdev->dev, "rga ion client create success!\n");
+       }
     #endif\r
 \r
-    #if RGA_TEST_TIME\r
-    rga_start = ktime_get();\r
-    #endif\r
-\r
-    ret = rga_blit(session, req);\r
-\r
-    ret_timeout = wait_event_interruptible_timeout(session->wait, atomic_read(&session->done), RGA_TIMEOUT_DELAY);\r
-\r
-    if (unlikely(ret_timeout< 0))\r
-    {\r
-               pr_err("sync pid %d wait task ret %d\n", session->pid, ret_timeout);\r
-        mutex_lock(&rga_service.lock);\r
-        rga_del_running_list();\r
-        mutex_unlock(&rga_service.lock);\r
-        ret = -ETIMEDOUT;\r
-       }\r
-    else if (0 == ret_timeout)\r
-    {\r
-               pr_err("sync pid %d wait %d task done timeout\n", session->pid, atomic_read(&session->task_running));\r
-        mutex_lock(&rga_service.lock);\r
-        rga_del_running_list_timeout();\r
-        rga_try_set_reg();\r
-        mutex_unlock(&rga_service.lock);\r
-               ret = -ETIMEDOUT;\r
-       }\r
-\r
-    #if RGA_TEST_TIME\r
-    rga_end = ktime_get();\r
-    rga_end = ktime_sub(rga_end, rga_start);\r
-    printk("sync one cmd end time %d\n", (int)ktime_to_us(rga_end));\r
-    #endif\r
-\r
-    return ret;\r
-}\r
-\r
-\r
-static long rga_ioctl(struct file *file, uint32_t cmd, unsigned long arg)\r
-{\r
-    struct rga_req *req;\r
-       int ret = 0;\r
-    rga_session *session = (rga_session *)file->private_data;\r
-\r
-       if (NULL == session)\r
-    {\r
-        printk("%s [%d] rga thread session is null\n",__FUNCTION__,__LINE__);\r
-               return -EINVAL;\r
-       }\r
-\r
-    req = kzalloc(sizeof(struct rga_req), GFP_KERNEL);\r
-    if(req == NULL)\r
-    {\r
-        printk("%s [%d] get rga_req mem failed\n",__FUNCTION__,__LINE__);\r
-        return -EINVAL;\r
-    }\r
-\r
-       mutex_lock(&rga_service.mutex);\r
-\r
-       switch (cmd)\r
-       {\r
-               case RGA_BLIT_SYNC:\r
-               if (unlikely(copy_from_user(req, (struct rga_req*)arg, sizeof(struct rga_req))))\r
-            {\r
-                       ERR("copy_from_user failed\n");\r
-                       ret = -EFAULT;\r
-                break;\r
-               }\r
-            ret = rga_blit_sync(session, req);\r
-            break;\r
-               case RGA_BLIT_ASYNC:\r
-               if (unlikely(copy_from_user(req, (struct rga_req*)arg, sizeof(struct rga_req))))\r
-            {\r
-                       ERR("copy_from_user failed\n");\r
-                       ret = -EFAULT;\r
-                break;\r
-               }\r
-\r
-            if((atomic_read(&rga_service.total_running) > 16))\r
-            {\r
-                           ret = rga_blit_sync(session, req);\r
-            }\r
-            else\r
-            {\r
-                ret = rga_blit_async(session, req);\r
-            }\r
-                       break;\r
-               case RGA_FLUSH:\r
-                       ret = rga_flush(session, arg);\r
-                       break;\r
-        case RGA_GET_RESULT:\r
-            ret = rga_get_result(session, arg);\r
-            break;\r
-        case RGA_GET_VERSION:\r
-            ret = copy_to_user((void *)arg, RGA_VERSION, sizeof(RGA_VERSION));\r
-            //ret = 0;\r
-            break;\r
-               default:\r
-                       ERR("unknown ioctl cmd!\n");\r
-                       ret = -EINVAL;\r
-                       break;\r
-       }\r
-\r
-       mutex_unlock(&rga_service.mutex);\r
-\r
-        kfree(req);\r
-\r
-       return ret;\r
-}\r
-\r
-static int rga_open(struct inode *inode, struct file *file)\r
-{\r
-    rga_session *session = kzalloc(sizeof(rga_session), GFP_KERNEL);\r
-       if (NULL == session) {\r
-               pr_err("unable to allocate memory for rga_session.");\r
-               return -ENOMEM;\r
-       }\r
-\r
-       session->pid = current->pid;\r
-    //printk(KERN_DEBUG  "+");\r
-\r
-       INIT_LIST_HEAD(&session->waiting);\r
-       INIT_LIST_HEAD(&session->running);\r
-       INIT_LIST_HEAD(&session->list_session);\r
-       init_waitqueue_head(&session->wait);\r
-       mutex_lock(&rga_service.lock);\r
-       list_add_tail(&session->list_session, &rga_service.session);\r
-       mutex_unlock(&rga_service.lock);\r
-       atomic_set(&session->task_running, 0);\r
-    atomic_set(&session->num_done, 0);\r
-\r
-       file->private_data = (void *)session;\r
-\r
-    //DBG("*** rga dev opened by pid %d *** \n", session->pid);\r
-       return nonseekable_open(inode, file);\r
-\r
-}\r
-\r
-static int rga_release(struct inode *inode, struct file *file)\r
-{\r
-    int task_running;\r
-       rga_session *session = (rga_session *)file->private_data;\r
-       if (NULL == session)\r
-               return -EINVAL;\r
-    //printk(KERN_DEBUG  "-");\r
-       task_running = atomic_read(&session->task_running);\r
-\r
-    if (task_running)\r
-    {\r
-               pr_err("rga_service session %d still has %d task running when closing\n", session->pid, task_running);\r
-               msleep(100);\r
-        /*ͬ²½*/\r
-       }\r
-\r
-       wake_up_interruptible_sync(&session->wait);\r
-       mutex_lock(&rga_service.lock);\r
-       list_del(&session->list_session);\r
-       rga_service_session_clear(session);\r
-       kfree(session);\r
-       mutex_unlock(&rga_service.lock);\r
-\r
-    //DBG("*** rga dev close ***\n");\r
-       return 0;\r
-}\r
-\r
-static irqreturn_t rga_irq_thread(int irq, void *dev_id)\r
-{\r
-       mutex_lock(&rga_service.lock);\r
-       if (rga_service.enable) {\r
-               rga_del_running_list();\r
-               rga_try_set_reg();\r
-       }\r
-       mutex_unlock(&rga_service.lock);\r
-\r
-       return IRQ_HANDLED;\r
-}\r
-\r
-static irqreturn_t rga_irq(int irq,  void *dev_id)\r
-{\r
-       /*clear INT */\r
-       rga_write(rga_read(RGA_INT) | (0x1<<6) | (0x1<<7) | (0x1<<4), RGA_INT);\r
-\r
-       return IRQ_WAKE_THREAD;\r
-}\r
-\r
-struct file_operations rga_fops = {\r
-       .owner          = THIS_MODULE,\r
-       .open           = rga_open,\r
-       .release        = rga_release,\r
-       .unlocked_ioctl         = rga_ioctl,\r
-};\r
-\r
-static struct miscdevice rga_dev ={\r
-    .minor = RGA_MAJOR,\r
-    .name  = "rga",\r
-    .fops  = &rga_fops,\r
-};\r
-\r
-static int __devinit rga_drv_probe(struct platform_device *pdev)\r
-{\r
-       struct rga_drvdata *data;\r
-       int ret = 0;\r
-\r
-       INIT_LIST_HEAD(&rga_service.waiting);\r
-       INIT_LIST_HEAD(&rga_service.running);\r
-       INIT_LIST_HEAD(&rga_service.done);\r
-       INIT_LIST_HEAD(&rga_service.session);\r
-       mutex_init(&rga_service.lock);\r
-       mutex_init(&rga_service.mutex);\r
-       atomic_set(&rga_service.total_running, 0);\r
-       atomic_set(&rga_service.src_format_swt, 0);\r
-       rga_service.last_prc_src_format = 1; /* default is yuv first*/\r
-       rga_service.enable = false;\r
-\r
-       data = kzalloc(sizeof(struct rga_drvdata), GFP_KERNEL);\r
-       if(NULL == data)\r
-       {\r
-               ERR("failed to allocate driver data.\n");\r
-               return -ENOMEM;\r
-       }\r
-\r
-       INIT_DELAYED_WORK(&data->power_off_work, rga_power_off_work);\r
-       wake_lock_init(&data->wake_lock, WAKE_LOCK_SUSPEND, "rga");\r
-\r
-       data->pd_rga = clk_get(NULL, "pd_rga");\r
-       data->aclk_rga = clk_get(NULL, "aclk_rga");\r
-       data->hclk_rga = clk_get(NULL, "hclk_rga");\r
-\r
-       /* map the memory */\r
-       if (!request_mem_region(RK30_RGA_PHYS, RK30_RGA_SIZE, "rga_io"))\r
-       {\r
-               pr_info("failed to reserve rga HW regs\n");\r
-               return -EBUSY;\r
-       }\r
-       data->rga_base = (void*)ioremap_nocache(RK30_RGA_PHYS, RK30_RGA_SIZE);\r
-       if (data->rga_base == NULL)\r
-       {\r
-               ERR("rga ioremap failed\n");\r
-               ret = -ENOENT;\r
-               goto err_ioremap;\r
-       }\r
-\r
-       /* get the IRQ */\r
-       data->irq = platform_get_irq(pdev, 0);\r
-       if (data->irq <= 0)\r
-       {\r
-               ERR("failed to get rga irq resource (%d).\n", data->irq);\r
-               ret = data->irq;\r
-               goto err_irq;\r
-       }\r
-\r
-       /* request the IRQ */\r
-       ret = request_threaded_irq(data->irq, rga_irq, rga_irq_thread, 0, "rga", pdev);\r
-       if (ret)\r
-       {\r
-               ERR("rga request_irq failed (%d).\n", ret);\r
-               goto err_irq;\r
-       }\r
-\r
-       platform_set_drvdata(pdev, data);\r
-       drvdata = data;\r
-\r
        ret = misc_register(&rga_dev);\r
        if(ret)\r
        {\r
@@ -1144,7 +1303,7 @@ err_irq:
        iounmap(data->rga_base);\r
 err_ioremap:\r
        wake_lock_destroy(&data->wake_lock);\r
-       kfree(data);\r
+       //kfree(data);\r
 \r
        return ret;\r
 }\r
@@ -1159,20 +1318,21 @@ static int rga_drv_remove(struct platform_device *pdev)
        free_irq(data->irq, &data->miscdev);\r
        iounmap((void __iomem *)(data->rga_base));\r
 \r
-       clk_put(data->pd_rga);\r
-       clk_put(data->aclk_rga);\r
-       clk_put(data->hclk_rga);\r
+       //clk_put(data->pd_rga);\r
+       devm_clk_put(&pdev->dev, data->aclk_rga);\r
+       devm_clk_put(&pdev->dev, data->hclk_rga);\r
 \r
-       kfree(data);\r
+       //kfree(data);\r
        return 0;\r
 }\r
 \r
 static struct platform_driver rga_driver = {\r
        .probe          = rga_drv_probe,\r
-       .remove         = __devexit_p(rga_drv_remove),\r
+       .remove         = rga_drv_remove,\r
        .driver         = {\r
                .owner  = THIS_MODULE,\r
                .name   = "rga",\r
+               .of_match_table = of_match_ptr(rockchip_rga_dt_ids),\r
        },\r
 };\r
 \r
@@ -1185,31 +1345,40 @@ static int __init rga_init(void)
 {\r
        int ret;\r
     uint32_t *mmu_buf;\r
+    unsigned long *mmu_buf_virtual;\r
     uint32_t i;\r
     uint32_t *buf_p;\r
 \r
     /* malloc pre scale mid buf mmu table */\r
     mmu_buf = kzalloc(1024*8, GFP_KERNEL);\r
-    if(mmu_buf == NULL)\r
-    {\r
+    mmu_buf_virtual = kzalloc(1024*2*sizeof(unsigned long), GFP_KERNEL);\r
+    if(mmu_buf == NULL) {\r
         printk(KERN_ERR "RGA get Pre Scale buff failed. \n");\r
         return -1;\r
     }\r
 \r
-    /* malloc 8 M buf */\r
-    for(i=0; i<2048; i++)\r
-    {\r
+    /* malloc 4 M buf */\r
+    for(i=0; i<1024; i++) {\r
         buf_p = (uint32_t *)__get_free_page(GFP_KERNEL|__GFP_ZERO);\r
-        if(buf_p == NULL)\r
-        {\r
+        if(buf_p == NULL) {\r
             printk(KERN_ERR "RGA init pre scale buf falied\n");\r
             return -ENOMEM;\r
         }\r
-\r
-        mmu_buf[i] = virt_to_phys((void *)((uint32_t)buf_p));\r
+        mmu_buf[i] = virt_to_phys((void *)((unsigned long)buf_p));\r
+        mmu_buf_virtual[i] = (unsigned long)buf_p;\r
     }\r
 \r
     rga_service.pre_scale_buf = (uint32_t *)mmu_buf;\r
+    rga_service.pre_scale_buf_virtual = (unsigned long *)mmu_buf_virtual;\r
+\r
+    buf_p = kmalloc(1024*256, GFP_KERNEL);\r
+    rga_mmu_buf.buf_virtual = buf_p;\r
+    rga_mmu_buf.buf = (uint32_t *)virt_to_phys((void *)((unsigned long)buf_p));\r
+    rga_mmu_buf.front = 0;\r
+    rga_mmu_buf.back = 64*1024;\r
+    rga_mmu_buf.size = 64*1024;\r
+\r
+    rga_mmu_buf.pages = kmalloc((32768)* sizeof(struct page *), GFP_KERNEL);\r
 \r
        if ((ret = platform_driver_register(&rga_driver)) != 0)\r
        {\r
@@ -1217,7 +1386,30 @@ static int __init rga_init(void)
                        return ret;\r
        }\r
 \r
-    //rga_test_0();\r
+    {\r
+        rga_session_global.pid = 0x0000ffff;\r
+        INIT_LIST_HEAD(&rga_session_global.waiting);\r
+        INIT_LIST_HEAD(&rga_session_global.running);\r
+        INIT_LIST_HEAD(&rga_session_global.list_session);\r
+\r
+        INIT_LIST_HEAD(&rga_service.waiting);\r
+           INIT_LIST_HEAD(&rga_service.running);\r
+           INIT_LIST_HEAD(&rga_service.done);\r
+           INIT_LIST_HEAD(&rga_service.session);\r
+\r
+        init_waitqueue_head(&rga_session_global.wait);\r
+        //mutex_lock(&rga_service.lock);\r
+        list_add_tail(&rga_session_global.list_session, &rga_service.session);\r
+        //mutex_unlock(&rga_service.lock);\r
+        atomic_set(&rga_session_global.task_running, 0);\r
+        atomic_set(&rga_session_global.num_done, 0);\r
+    }\r
+\r
+\r
+\r
+    #if RGA_TEST_CASE\r
+    rga_test_0();\r
+    #endif\r
 \r
        INFO("Module initialized.\n");\r
 \r
@@ -1230,22 +1422,29 @@ static void __exit rga_exit(void)
 \r
     rga_power_off();\r
 \r
-    for(i=0; i<2048; i++)\r
+    for(i=0; i<1024; i++)\r
     {\r
-        if((uint32_t *)rga_service.pre_scale_buf[i] != NULL)\r
+        if((unsigned long)rga_service.pre_scale_buf_virtual[i])\r
         {\r
-            __free_page((void *)rga_service.pre_scale_buf[i]);\r
+            __free_page((void *)rga_service.pre_scale_buf_virtual[i]);\r
         }\r
     }\r
 \r
     if(rga_service.pre_scale_buf != NULL) {\r
         kfree((uint8_t *)rga_service.pre_scale_buf);\r
     }\r
+\r
+    if (rga_mmu_buf.buf_virtual)\r
+        kfree(rga_mmu_buf.buf_virtual);\r
+\r
+    if (rga_mmu_buf.pages)\r
+        kfree(rga_mmu_buf.pages);\r
+\r
        platform_driver_unregister(&rga_driver);\r
 }\r
 \r
 \r
-#if 0\r
+#if RGA_TEST_CASE\r
 \r
 extern struct fb_info * rk_get_fb(int fb_id);\r
 EXPORT_SYMBOL(rk_get_fb);\r
@@ -1255,12 +1454,17 @@ EXPORT_SYMBOL(rk_direct_fb_show);
 \r
 unsigned int src_buf[1920*1080];\r
 unsigned int dst_buf[1920*1080];\r
+//unsigned int tmp_buf[1920*1080 * 2];\r
 \r
 void rga_test_0(void)\r
 {\r
     struct rga_req req;\r
     rga_session session;\r
     unsigned int *src, *dst;\r
+    uint32_t i, j;\r
+    uint8_t *p;\r
+    uint8_t t;\r
+    uint32_t *dst0, *dst1, *dst2;\r
 \r
     struct fb_info *fb;\r
 \r
@@ -1278,13 +1482,14 @@ void rga_test_0(void)
     fb = rk_get_fb(0);\r
 \r
     memset(&req, 0, sizeof(struct rga_req));\r
-    src = Y4200_320_240_swap0;\r
+    src = src_buf;\r
     dst = dst_buf;\r
 \r
-    //memset(src_buf, 0x80, 1920*1080*4);\r
+    memset(src_buf, 0x80, 1024*600*4);\r
+\r
+    dmac_flush_range(&src_buf[0], &src_buf[1024*600]);\r
+    outer_flush_range(virt_to_phys(&src_buf[0]),virt_to_phys(&src_buf[1024*600]));\r
 \r
-    //dmac_flush_range(&src_buf[0], &src_buf[1920*1080]);\r
-    //outer_flush_range(virt_to_phys(&src_buf[0]),virt_to_phys(&src_buf[1024*1024]));\r
 \r
     #if 0\r
     memset(src_buf, 0x80, 800*480*4);\r
@@ -1294,24 +1499,37 @@ 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
-    req.src.act_w = 320;\r
-    req.src.act_h = 240;\r
+    dst0 = &dst_buf[0];\r
+    //dst1 = &dst_buf[1280*800*4];\r
+    //dst2 = &dst_buf[1280*800*4*2];\r
+\r
+    i = j = 0;\r
+\r
+    printk("\n********************************\n");\r
+    printk("************ RGA_TEST ************\n");\r
+    printk("********************************\n\n");\r
+\r
+    req.src.act_w = 1024;\r
+    req.src.act_h = 600;\r
 \r
-    req.src.vir_w = 320;\r
-    req.src.vir_h = 240;\r
-    req.src.yrgb_addr = (uint32_t)src;\r
-    req.src.uv_addr = (uint32_t)UV4200_320_240_swap0;\r
-    req.src.v_addr = (uint32_t)V4200_320_240_swap0;\r
-    req.src.format = RK_FORMAT_YCbCr_420_SP;\r
+    req.src.vir_w = 1024;\r
+    req.src.vir_h = 600;\r
+    req.src.yrgb_addr = (uint32_t)virt_to_phys(src);\r
+    req.src.uv_addr = (uint32_t)(req.src.yrgb_addr + 1080*1920);\r
+    req.src.v_addr = (uint32_t)virt_to_phys(src);\r
+    req.src.format = RK_FORMAT_RGBA_8888;\r
 \r
-    req.dst.act_w = 1280;\r
-    req.dst.act_h = 800;\r
+    req.dst.act_w = 600;\r
+    req.dst.act_h = 352;\r
 \r
     req.dst.vir_w = 1280;\r
     req.dst.vir_h = 800;\r
-    req.dst.x_offset = 0;\r
+    req.dst.x_offset = 600;\r
     req.dst.y_offset = 0;\r
-    req.dst.yrgb_addr = (uint32_t)dst;\r
+\r
+    dst = dst0;\r
+\r
+    req.dst.yrgb_addr = ((uint32_t)virt_to_phys(dst));\r
 \r
     //req.dst.format = RK_FORMAT_RGB_565;\r
 \r
@@ -1324,19 +1542,26 @@ void rga_test_0(void)
     //req.fg_color = 0x80ffffff;\r
 \r
     req.rotate_mode = 1;\r
-    req.scale_mode = 2;\r
+    //req.scale_mode = 2;\r
 \r
     //req.alpha_rop_flag = 0;\r
-    //req.alpha_rop_mode = 0x1;\r
+    //req.alpha_rop_mode = 0x19;\r
+    //req.PD_mode = 3;\r
+\r
+    req.sina = 65536;\r
+    req.cosa = 0;\r
 \r
-    req.sina = 0;\r
-    req.cosa = 65536;\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("src = %.8x\n", req.src.uv_addr);\r
+    //printk("dst = %.8x\n", req.dst.yrgb_addr);\r
 \r
-    req.mmu_info.mmu_flag = 0x21;\r
-    req.mmu_info.mmu_en = 1;\r
 \r
     rga_blit_sync(&session, &req);\r
 \r
+    #if 1\r
     fb->var.bits_per_pixel = 32;\r
 \r
     fb->var.xres = 1280;\r
@@ -1365,6 +1590,7 @@ void rga_test_0(void)
     fb->fix.smem_start = virt_to_phys(dst);\r
 \r
     rk_direct_fb_show(fb);\r
+    #endif\r
 \r
 }\r
 \r