openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: staging: rkisp1: params: use rkisp1_param_set_bits to set reg in isr 

replace a read and write of RKISP1_CIF_ISP_CTRL register
in the isr with the 'rkisp1_param_set_bits' function
that does that.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Dafna Hirschfeld 2020-08-15 12:37:22 +02:00 committed by Mauro Carvalho Chehab
parent c85d0eec3f
commit fb4ca983ad
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/media/rkisp1/rkisp1-params.c
View File

@ -1191,7 +1191,6 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1)
struct rkisp1_params *params = &rkisp1->params; struct rkisp1_params *params = &rkisp1->params;
struct rkisp1_params_cfg *new_params; struct rkisp1_params_cfg *new_params;
struct rkisp1_buffer *cur_buf = NULL; struct rkisp1_buffer *cur_buf = NULL;
u32 isp_ctrl;
spin_lock(&params->config_lock); spin_lock(&params->config_lock);
if (!params->is_streaming) { if (!params->is_streaming) {
@ -1214,9 +1213,7 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1)
rkisp1_isp_isr_meas_config(params, new_params); rkisp1_isp_isr_meas_config(params, new_params);
/* update shadow register immediately */ /* update shadow register immediately */
isp_ctrl = rkisp1_read(params->rkisp1, RKISP1_CIF_ISP_CTRL); rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
isp_ctrl |= RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD;
rkisp1_write(params->rkisp1, isp_ctrl, RKISP1_CIF_ISP_CTRL);
spin_lock(&params->config_lock); spin_lock(&params->config_lock);
list_del(&cur_buf->queue); list_del(&cur_buf->queue);