From a130e5ac6775ec189a14c302ac34870d1acd2f8f Mon Sep 17 00:00:00 2001 From: Yu Qiaowei Date: Tue, 10 May 2022 14:49:24 +0800 Subject: [PATCH] video: rockchip: rga3: fill mode disables src0 channel Update driver version to 1.2.11 Signed-off-by: Yu Qiaowei Change-Id: I132581e492bc0b6880bd6227cb083b263e2dc2d2 --- drivers/video/rockchip/rga3/include/rga_drv.h | 2 +- drivers/video/rockchip/rga3/rga_mm.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/video/rockchip/rga3/include/rga_drv.h b/drivers/video/rockchip/rga3/include/rga_drv.h index 6d2ed65fa781..be3a4e65fffc 100644 --- a/drivers/video/rockchip/rga3/include/rga_drv.h +++ b/drivers/video/rockchip/rga3/include/rga_drv.h @@ -86,7 +86,7 @@ #define DRIVER_MAJOR_VERISON 1 #define DRIVER_MINOR_VERSION 2 -#define DRIVER_REVISION_VERSION 10 +#define DRIVER_REVISION_VERSION 11 #define DRIVER_VERSION (STR(DRIVER_MAJOR_VERISON) "." STR(DRIVER_MINOR_VERSION) \ "." STR(DRIVER_REVISION_VERSION)) diff --git a/drivers/video/rockchip/rga3/rga_mm.c b/drivers/video/rockchip/rga3/rga_mm.c index 19b255553abb..974a7504eb38 100644 --- a/drivers/video/rockchip/rga3/rga_mm.c +++ b/drivers/video/rockchip/rga3/rga_mm.c @@ -1621,14 +1621,17 @@ int rga_mm_get_external_buffer(struct rga_job *job) struct rga_img_info_t *dst = NULL; struct rga_img_info_t *els = NULL; - src0 = &job->rga_command_base.src; - dst = &job->rga_command_base.dst; + if (job->rga_command_base.render_mode != COLOR_FILL_MODE) + src0 = &job->rga_command_base.src; + if (job->rga_command_base.render_mode != UPDATE_PALETTE_TABLE_MODE) src1 = job->rga_command_base.bsfilter_flag ? &job->rga_command_base.pat : NULL; else els = &job->rga_command_base.pat; + dst = &job->rga_command_base.dst; + if (likely(src0)) { mmu_flag = ((job->rga_command_base.mmu_info.mmu_flag >> 8) & 1); ret = rga_mm_get_channel_external_buffer(mmu_flag, src0, &job->src_buffer);