From 522d8026677d8de8550d6a2a27d0c90d62ecc150 Mon Sep 17 00:00:00 2001 From: Yu Qiaowei Date: Mon, 30 Nov 2020 14:32:38 +0800 Subject: [PATCH] video/rockchip: rga2: Ion can be used below kernel4.4. Signed-off-by: Yu Qiaowei Change-Id: Ie9da1dfcd8682875763d401bc0c5d874ad98b870 --- drivers/video/rockchip/rga2/rga2_drv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c index cb9ca00ef0f3..4c4b2e598dd4 100644 --- a/drivers/video/rockchip/rga2/rga2_drv.c +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -54,6 +54,10 @@ #include "rga2_mmu_info.h" #include "RGA2_API.h" +#if IS_ENABLED(CONFIG_ION_ROCKCHIP) && (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)) +#include +#endif + #if ((defined(CONFIG_RK_IOMMU) || defined(CONFIG_ROCKCHIP_IOMMU)) && defined(CONFIG_ION_ROCKCHIP)) #define CONFIG_RGA_IOMMU #endif @@ -687,8 +691,8 @@ static int rga2_flush(rga2_session *session, unsigned long arg) { int ret = 0; int ret_timeout; - ktime_t start = 0; - ktime_t end = 0; + ktime_t start; + ktime_t end; #if RGA2_DEBUGFS if (RGA2_TEST_TIME)