fix rga2 compile error when 2 drives exist

diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c
index 222109173422dcf4ffd98ccf0540fa1a9a7ae59c..baafc54521e76ff29621dd99099520328ddef19d 100755 (executable)
--- a/drivers/video/rockchip/rga2/rga2_drv.c
+++ b/drivers/video/rockchip/rga2/rga2_drv.c
@@ -74,8 +74,8 @@
 \r
 #define RGA2_VERSION   "2.000"\r
 \r
-ktime_t rga_start;\r
-ktime_t rga_end;\r
+ktime_t rga2_start;\r
+ktime_t rga2_end;\r
 \r
 int rga2_flag = 0;\r
 \r
@@ -878,9 +878,9 @@ static int rga2_blit_sync(rga2_session *session, struct rga2_req *req)
        }\r
 \r
     #if RGA2_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
+    rga2_end = ktime_get();\r
+    rga2_end = ktime_sub(rga2_end, rga2_start);\r
+    printk("sync one cmd end time %d\n", (int)ktime_to_us(rga2_end));\r
     #endif\r
 \r
     return ret;\r
@@ -992,7 +992,7 @@ static long rga_ioctl(struct file *file, uint32_t cmd, unsigned long arg)
 }\r
 \r
 \r
-long rga_ioctl_kernel(struct rga_req *req_rga)\r
+long rga2_ioctl_kernel(struct rga_req *req_rga)\r
 {\r
        int ret = 0;\r
     rga2_session *session;\r
@@ -1109,7 +1109,7 @@ static struct miscdevice rga2_dev ={
 };\r
 \r
 static const struct of_device_id rockchip_rga_dt_ids[] = {\r
-       { .compatible = "rockchip,rga", },\r
+       { .compatible = "rockchip,rga2", },\r
        {},\r
 };\r
 \r

diff --git a/drivers/video/rockchip/rga2/rga2_rop.h b/drivers/video/rockchip/rga2/rga2_rop.h
index 60d90b8304de82f5bc693cdfd22b036666d4ddf6..d859543d6a45546abcb47d0e031c53aa4f68387a 100644 (file)
--- a/drivers/video/rockchip/rga2/rga2_rop.h
+++ b/drivers/video/rockchip/rga2/rga2_rop.h
@@ -3,7 +3,10 @@
 \r
 #include "rga2_type.h"\r
 \r
-UWORD32 ROP3_code[256] =\r
+extern UWORD32 ROP3_code[256];\r
+\r
+#if 0\r
+extern UWORD32 ROP3_code[256] =\r
 {\r
     0x00000007, 0x00000451, 0x00006051, 0x00800051, 0x00007041, 0x00800041, 0x00804830, 0x000004f0,//0\r
     0x00800765, 0x000004b0, 0x00000065, 0x000004f4, 0x00000075, 0x000004e6, 0x00804850, 0x00800005,\r
@@ -53,5 +56,6 @@ UWORD32 ROP3_code[256] =
     0x00800001, 0x00004850, 0x008004e6, 0x0000004e, 0x008004f4, 0x0000004c, 0x008004b0, 0x00004870,\r
     0x008004f0, 0x00004830, 0x00000048, 0x0080044e, 0x00000051, 0x008004d4, 0x00800451, 0x00800007,//f\r
 };\r
+#endif\r
 \r
 #endif\r