projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
diff --git
a/drivers/video/rockchip/rga/rga_drv.c
b/drivers/video/rockchip/rga/rga_drv.c
index d5857c9dac53c2ce1a764a5063965253337ff3cd..d897c8795619c72816e1115f7a934c8393977b66 100755
(executable)
--- a/
drivers/video/rockchip/rga/rga_drv.c
+++ b/
drivers/video/rockchip/rga/rga_drv.c
@@
-641,7
+641,7
@@
static void rga_try_set_reg(void)
__dma_flush_range(&rga_service.cmd_buff[0], &rga_service.cmd_buff[28]);
\r
#endif
\r
- #if
defined(CONFIG_ARCH_RK30)
+ #if
1
rga_soft_reset();
#endif