shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: vicap add mutex lock for group sync mode

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iacb2fb3c1dbeac9668a0fda27f9197878fea5b4e
This commit is contained in:
Zefa Chen
2022-07-01 20:53:38 +08:00
committed by Tao Huang
parent 15e40b3515
commit 3e29852076
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/platform/rockchip/cif/capture.c
View File

@@ -3439,7 +3439,7 @@ static void rkcif_detach_sync_mode(struct rkcif_device *cif_dev)
if ((!cif_dev->sync_type) ||
(atomic_read(&cif_dev->pipe.stream_cnt) != 0))
return;
mutex_lock(&hw->dev_lock);
hw->sync_config.streaming_cnt--;
if (cif_dev->sync_type == EXTERNAL_MASTER_MODE) {
for (i = 0; i < hw->sync_config.ext_master.count; i++) {
@@ -3469,6 +3469,7 @@ static void rkcif_detach_sync_mode(struct rkcif_device *cif_dev)
for (i = 0; i < hw->dev_num; i++)
hw->cif_dev[i]->sync_type = NO_SYNC_MODE;
}
mutex_unlock(&hw->dev_lock);
}
void rkcif_do_stop_stream(struct rkcif_stream *stream,
@@ -3599,8 +3600,8 @@ void rkcif_do_stop_stream(struct rkcif_stream *stream,
rkcif_destroy_dummy_buf(stream);
stream->cur_stream_mode &= ~mode;
v4l2_info(&dev->v4l2_dev, "stream[%d] stopping finished\n", stream->id);
rkcif_detach_sync_mode(dev);
mutex_unlock(&dev->stream_lock);
rkcif_detach_sync_mode(dev);
}
static void rkcif_stop_streaming(struct vb2_queue *queue)
@@ -4424,8 +4425,11 @@ static void rkcif_attach_sync_mode(struct rkcif_hw *hw)
int sync_type = 0;
int count = 0;
if (hw->sync_config.is_attach)
mutex_lock(&hw->dev_lock);
if (hw->sync_config.is_attach) {
mutex_unlock(&hw->dev_lock);
return;
}
memset(&hw->sync_config, 0, sizeof(struct rkcif_multi_sync_config));
for (i = 0; i < hw->dev_num; i++) {
@@ -4481,15 +4485,13 @@ static void rkcif_attach_sync_mode(struct rkcif_hw *hw)
dev_info(hw->dev,
"Missing slave device, do not use sync mode\n");
}
if (hw->sync_config.ext_master.count &&
hw->sync_config.slave.count)
dev_info(hw->dev,
"There are two types of slave devices, it may cause problems\n");
} else {
dev_info(hw->dev,
"Only support one master device, master device count %d\n",
hw->sync_config.int_master.count);
"group mode, int_master %d, ext_master %d, slave %d\n",
hw->sync_config.int_master.count,
hw->sync_config.ext_master.count,
hw->sync_config.slave.count);
}
mutex_unlock(&hw->dev_lock);
}
int rkcif_do_start_stream(struct rkcif_stream *stream, unsigned int mode)
@@ -4506,8 +4508,8 @@ int rkcif_do_start_stream(struct rkcif_stream *stream, unsigned int mode)
v4l2_info(&dev->v4l2_dev, "stream[%d] start streaming\n", stream->id);
mutex_lock(&dev->stream_lock);
rkcif_attach_sync_mode(dev->hw_dev);
mutex_lock(&dev->stream_lock);
if ((stream->cur_stream_mode & RKCIF_STREAM_MODE_CAPTURE) == mode) {
ret = -EBUSY;
v4l2_err(v4l2_dev, "stream in busy state\n");

13
drivers/media/platform/rockchip/cif/dev.c
View File

@@ -891,11 +891,13 @@ static void rkcif_set_sensor_streamon_in_sync_mode(struct rkcif_device *cif_dev)
int ret = 0;
bool is_streaming = false;
if (cif_dev->sync_type) {
hw->sync_config.streaming_cnt++;
if (hw->sync_config.streaming_cnt < hw->sync_config.dev_cnt)
return;
} else {
if (!cif_dev->sync_type)
return;
mutex_lock(&hw->dev_lock);
hw->sync_config.streaming_cnt++;
if (hw->sync_config.streaming_cnt < hw->sync_config.dev_cnt) {
mutex_unlock(&hw->dev_lock);
return;
}
@@ -981,6 +983,7 @@ static void rkcif_set_sensor_streamon_in_sync_mode(struct rkcif_device *cif_dev)
"quick stream in sync mode, int_master_dev[%d]\n", i);
}
}
mutex_unlock(&hw->dev_lock);
}
/*