From 65d129a414904f20110fa1b1ea92708ae24bc4d0 Mon Sep 17 00:00:00 2001 From: Li Huang Date: Tue, 29 Mar 2022 14:42:14 +0800 Subject: [PATCH] video: rockchip: rve: Update to 1.0.2 support config ASYNC Signed-off-by: Li Huang Change-Id: I762cf8e67dbd9ceaebc3d58120652c8d89f6e92a --- drivers/video/rockchip/rve/include/rve_drv.h | 2 +- drivers/video/rockchip/rve/rve_job.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/rve/include/rve_drv.h b/drivers/video/rockchip/rve/include/rve_drv.h index 7bc00ca6eecd..7237627d4192 100644 --- a/drivers/video/rockchip/rve/include/rve_drv.h +++ b/drivers/video/rockchip/rve/include/rve_drv.h @@ -72,7 +72,7 @@ #define DRIVER_MAJOR_VERSION 1 #define DRIVER_MINOR_VERSION 0 -#define DRIVER_REVISION_VERSION 1 +#define DRIVER_REVISION_VERSION 2 #define DRIVER_VERSION (STR(DRIVER_MAJOR_VERSION) "." STR(DRIVER_MINOR_VERSION) \ "." STR(DRIVER_REVISION_VERSION)) diff --git a/drivers/video/rockchip/rve/rve_job.c b/drivers/video/rockchip/rve/rve_job.c index 19b87936d5d2..1987e6b1df8c 100644 --- a/drivers/video/rockchip/rve/rve_job.c +++ b/drivers/video/rockchip/rve/rve_job.c @@ -712,6 +712,10 @@ int rve_job_commit_by_user_ctx(struct rve_user_ctx_t *user_ctx) ctx->running_job_count = 0; ctx->is_running = true; + ctx->sync_mode = user_ctx->sync_mode; + if (ctx->sync_mode == 0) + ctx->sync_mode = RVE_SYNC; + spin_unlock_irqrestore(&ctx->lock, flags); for (i = 0; i < ctx->cmd_num; i++) { @@ -824,9 +828,6 @@ int rve_job_commit(struct rve_internal_ctx_t *ctx) #endif int ret = 0; - /* TODO: remove */ - ctx->sync_mode = RVE_SYNC; - job = rve_job_alloc(ctx); if (!job) { pr_err("failed to alloc rve job!\n");