Commit 581214d3 authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab

media: staging: rkisp1: params: don't release lock in isr before buffer is done

In the irq handler 'rkisp1_params_isr', the lock 'config_lock'
should be held as long as the current buffer is used. Otherwise the
stop_streaming calback might remove it from the list and
pass it to userspace while it is referenced in the irq handler.
Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent fb4ca983
...@@ -1202,10 +1202,11 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1) ...@@ -1202,10 +1202,11 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1)
if (!list_empty(&params->params)) if (!list_empty(&params->params))
cur_buf = list_first_entry(&params->params, cur_buf = list_first_entry(&params->params,
struct rkisp1_buffer, queue); struct rkisp1_buffer, queue);
spin_unlock(&params->config_lock);
if (!cur_buf) if (!cur_buf) {
spin_unlock(&params->config_lock);
return; return;
}
new_params = (struct rkisp1_params_cfg *)(cur_buf->vaddr); new_params = (struct rkisp1_params_cfg *)(cur_buf->vaddr);
...@@ -1215,12 +1216,11 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1) ...@@ -1215,12 +1216,11 @@ void rkisp1_params_isr(struct rkisp1_device *rkisp1)
/* update shadow register immediately */ /* update shadow register immediately */
rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD); rkisp1_param_set_bits(params, RKISP1_CIF_ISP_CTRL, RKISP1_CIF_ISP_CTRL_ISP_CFG_UPD);
spin_lock(&params->config_lock);
list_del(&cur_buf->queue); list_del(&cur_buf->queue);
spin_unlock(&params->config_lock);
cur_buf->vb.sequence = frame_sequence; cur_buf->vb.sequence = frame_sequence;
vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE); vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
spin_unlock(&params->config_lock);
} }
static const struct rkisp1_cif_isp_awb_meas_config rkisp1_awb_params_default_config = { static const struct rkisp1_cif_isp_awb_meas_config rkisp1_awb_params_default_config = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment