From e3ee3291f72f70f02fa41415a1d01b3a7b2e44f3 Mon Sep 17 00:00:00 2001 From: Li Huang Date: Tue, 30 Nov 2021 14:34:22 +0800 Subject: [PATCH] video: rockchip: rga3: Update version to 1.1.4 change to load rga3 first Signed-off-by: Li Huang Change-Id: I642ba342632dcef30a85fe438ff1f7e04c1343df --- drivers/video/rockchip/rga3/include/rga_drv.h | 2 +- drivers/video/rockchip/rga3/rga_drv.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/video/rockchip/rga3/include/rga_drv.h b/drivers/video/rockchip/rga3/include/rga_drv.h index eda5d353e0f2..23467d74ed3f 100644 --- a/drivers/video/rockchip/rga3/include/rga_drv.h +++ b/drivers/video/rockchip/rga3/include/rga_drv.h @@ -63,7 +63,7 @@ /* Driver information */ #define DRIVER_DESC "RGA multicore Device Driver" #define DRIVER_NAME "rga_multicore" -#define DRIVER_VERSION "1.1.3" +#define DRIVER_VERSION "1.1.4" #define RGA3_VERSION "2.000" /* time limit */ diff --git a/drivers/video/rockchip/rga3/rga_drv.c b/drivers/video/rockchip/rga3/rga_drv.c index 21e375a030b9..8cc85c397853 100644 --- a/drivers/video/rockchip/rga3/rga_drv.c +++ b/drivers/video/rockchip/rga3/rga_drv.c @@ -705,12 +705,6 @@ static int __init rga_init(void) wake_lock_init(&rga_drvdata->wake_lock, WAKE_LOCK_SUSPEND, "rga"); - ret = platform_driver_register(&rga2_driver); - if (ret != 0) { - pr_err("Platform device rga2_driver register failed (%d).\n", ret); - return ret; - } - ret = platform_driver_register(&rga3_core0_driver); if (ret != 0) { pr_err("Platform device rga3_core0_driver register failed (%d).\n", ret); @@ -723,6 +717,12 @@ static int __init rga_init(void) return ret; } + ret = platform_driver_register(&rga2_driver); + if (ret != 0) { + pr_err("Platform device rga2_driver register failed (%d).\n", ret); + return ret; + } + rga_drvdata->fence_ctx = rga_fence_context_alloc(); if (IS_ERR(rga_drvdata->fence_ctx)) { pr_err("failed to allocate fence context for RGA\n");