From 12dfe26a3ef059d5614dd80355129e82d6f24427 Mon Sep 17 00:00:00 2001 From: Mark Yao Date: Fri, 15 Sep 2017 18:27:39 +0800 Subject: [PATCH] video/rockchip: rga2: fix power domain reference count Change-Id: I6f3746556e5015289a30b88820b20724210c39a6 Signed-off-by: Mark Yao Reported-by: Finley Xiao --- drivers/video/rockchip/rga2/rga2_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c index b754c32e64db..e1492ee09819 100644 --- a/drivers/video/rockchip/rga2/rga2_drv.c +++ b/drivers/video/rockchip/rga2/rga2_drv.c @@ -246,10 +246,6 @@ static void rga2_power_on(void) static ktime_t last; ktime_t now = ktime_get(); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) - pm_runtime_get_sync(rga2_drvdata->dev); -#endif - if (ktime_to_ns(ktime_sub(now, last)) > NSEC_PER_SEC) { cancel_delayed_work_sync(&rga2_drvdata->power_off_work); rga2_queue_power_off_work(); @@ -259,6 +255,10 @@ static void rga2_power_on(void) if (rga2_service.enable) return; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) + pm_runtime_get_sync(rga2_drvdata->dev); +#endif + clk_prepare_enable(rga2_drvdata->rga2); clk_prepare_enable(rga2_drvdata->aclk_rga2); clk_prepare_enable(rga2_drvdata->hclk_rga2);