shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix rga2 compile error when 2 drives exist

Browse Source
This commit is contained in:
zsq
2014-08-07 16:39:07 +08:00
parent ad96d6d748
commit c7f72ac604
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/rockchip/rga2/rga2_drv.c
View File

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

6
drivers/video/rockchip/rga2/rga2_rop.h
View File

@@ -3,7 +3,10 @@
#include "rga2_type.h"
UWORD32 ROP3_code[256] =
extern UWORD32 ROP3_code[256];
#if 0
extern UWORD32 ROP3_code[256] =
{
0x00000007, 0x00000451, 0x00006051, 0x00800051, 0x00007041, 0x00800041, 0x00804830, 0x000004f0,//0
0x00800765, 0x000004b0, 0x00000065, 0x000004f4, 0x00000075, 0x000004e6, 0x00804850, 0x00800005,
@@ -53,5 +56,6 @@ UWORD32 ROP3_code[256] =
0x00800001, 0x00004850, 0x008004e6, 0x0000004e, 0x008004f4, 0x0000004c, 0x008004b0, 0x00004870,
0x008004f0, 0x00004830, 0x00000048, 0x0080044e, 0x00000051, 0x008004d4, 0x00800451, 0x00800007,//f
};
#endif
#endif