From: zsq Date: Fri, 13 Feb 2015 07:22:34 +0000 (+0800) Subject: Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next X-Git-Tag: firefly_0821_release~4158^2~447 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=abc2159654f50005bab3b6e03c5db269195dac4f;p=firefly-linux-kernel-4.4.55.git Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next --- abc2159654f50005bab3b6e03c5db269195dac4f diff --cc drivers/video/rockchip/rga/rga_drv.c index d5857c9dac53,d081f0ca8c8e..d897c8795619 --- a/drivers/video/rockchip/rga/rga_drv.c +++ b/drivers/video/rockchip/rga/rga_drv.c @@@ -633,15 -635,11 +633,15 @@@ static void rga_try_set_reg(void rga_copy_reg(reg, 0); rga_reg_from_wait_to_run(reg); - + + #ifdef CONFIG_ARM 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])); + outer_flush_range(virt_to_phys(&rga_service.cmd_buff[0]),virt_to_phys(&rga_service.cmd_buff[28])); + #elif defined(CONFIG_ARM64) + __dma_flush_range(&rga_service.cmd_buff[0], &rga_service.cmd_buff[28]); + #endif - #if defined(CONFIG_ARCH_RK30) + #if 1 rga_soft_reset(); #endif