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

media: rockchip: vicap force update buf when it's return and update very close to fe

Browse Source 
Change-Id: I019779287b2f2aa7885e4154c4ad0c0907d88e1a
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
This commit is contained in:
Zefa Chen
2025-09-17 09:59:01 +08:00
parent d0a4a638d6
commit e2b8f25af6
2 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2568,6 +2568,23 @@ out_get_buf:
rkcif_write_register(dev, frm_addr_y, buff_addr_y);
}
}
if (buf_stream->is_force_update) {
if (mbus_cfg->type == V4L2_MBUS_CSI2_DPHY ||
mbus_cfg->type == V4L2_MBUS_CSI2_CPHY) {
if (dev->chip_id < CHIP_RK3562_CIF)
rkcif_write_register_or(dev, CIF_REG_MIPI_LVDS_CTRL, 0x00010000);
else
rkcif_write_register_or(dev, get_reg_index_of_frm0_y_vlw(stream->id), BIT(31));
} else {
if (dev->chip_id < CHIP_RK3562_CIF)
rkcif_write_register_or(dev, CIF_REG_DVP_CTRL, 0x00010000);
else if (dev->chip_id < CHIP_RK3576_CIF)
rkcif_write_register_or(dev, CIF_REG_DVP_VIR_LINE_WIDTH, BIT(28) << stream->id);
else
rkcif_write_register_or(dev, CIF_REG_DVP_VIR_LINE_WIDTH, BIT(31));
}
buf_stream->is_force_update = false;
}
spin_unlock_irqrestore(&buf_stream->vbq_lock, flags);
return 0;
}
@@ -2584,6 +2601,19 @@ static int rkcif_assign_new_buffer_pingpong_toisp(struct rkcif_stream *stream,
return ret;
}
static void rkcif_check_force_update_buf(struct rkcif_stream *stream)
{
u64 cur_time = 0;
u64 offset = 0;
offset = stream->cifdev->readout_ns - 2000000;
cur_time = rkcif_time_get_ns(stream->cifdev);
if (stream->dma_en &&
(cur_time - stream->readout.fs_timestamp) > offset &&
!stream->is_in_vblank)
stream->is_force_update = true;
}
void rkcif_assign_check_buffer_update_toisp(struct rkcif_stream *stream)
{
struct rkcif_device *dev = stream->cifdev;
@@ -2634,6 +2664,11 @@ void rkcif_assign_check_buffer_update_toisp(struct rkcif_stream *stream)
buf_stream->toisp_buf_state.check_cnt == 0)
is_dual_update = true;
if ((buf_stream->toisp_buf_state.state == RKCIF_TOISP_BUF_LOSS ||
buf_stream->toisp_buf_state.state == RKCIF_TOISP_BUF_THESAME) &&
buf_stream->toisp_buf_state.check_cnt == 0)
rkcif_check_force_update_buf(buf_stream);
if ((dev->rdbk_debug > 2 &&
stream->frame_idx < 15) ||
rkcif_debug > 4)
@@ -6982,6 +7017,7 @@ void rkcif_do_stop_stream(struct rkcif_stream *stream,
stream->crop_mask = 0;
stream->frame_loss = 0;
stream->is_fb_first_frame = true;
stream->is_force_update = false;
}
if (mode == RKCIF_STREAM_MODE_CAPTURE) {
tasklet_disable(&stream->vb_done_tasklet);
@@ -8601,6 +8637,8 @@ int rkcif_do_start_stream(struct rkcif_stream *stream, enum rkcif_stream_mode mo
tasklet_enable(&stream->vb_done_tasklet);
if (stream->cur_stream_mode == RKCIF_STREAM_MODE_NONE) {
dev->sensor_linetime = rkcif_get_linetime(stream);
dev->readout_ns = dev->terminal_sensor.raw_rect.height * dev->sensor_linetime;
ret = dev->pipe.open(&dev->pipe, &node->vdev.entity, true);
if (ret < 0) {
v4l2_err(v4l2_dev, "open cif pipeline failed %d\n",
@@ -9095,6 +9133,7 @@ void rkcif_stream_init(struct rkcif_device *dev, u32 id)
memset(&stream->sensor_exp_info, 0, sizeof(stream->sensor_exp_info));
stream->frame_loss = 0;
stream->is_pause_stream = false;
stream->is_force_update = false;
}
int rkcif_sensor_set_power(struct rkcif_stream *stream, int on)
@@ -13179,8 +13218,10 @@ void rkcif_enable_dma_capture(struct rkcif_stream *stream, bool is_only_enable)
} else {
if (cif_dev->chip_id < CHIP_RK3562_CIF)
rkcif_write_register_or(cif_dev, CIF_REG_DVP_CTRL, 0x00010000);
else
else if (cif_dev->chip_id < CHIP_RK3576_CIF)
rkcif_write_register_or(cif_dev, CIF_REG_DVP_VIR_LINE_WIDTH, BIT(28) << stream->id);
else
rkcif_write_register_or(cif_dev, CIF_REG_DVP_VIR_LINE_WIDTH, BIT(31));
}
if (mbus_cfg->type == V4L2_MBUS_CSI2_DPHY ||
mbus_cfg->type == V4L2_MBUS_CSI2_CPHY) {

2
drivers/media/platform/rockchip/cif/dev.h
View File

@@ -680,6 +680,7 @@ struct rkcif_stream {
bool is_m_online_fb_res;
bool is_fb_first_frame;
bool is_pause_stream;
bool is_force_update;
};
struct rkcif_lvds_subdev {
@@ -1057,6 +1058,7 @@ struct rkcif_device {
u32 early_line;
int isp_runtime_max;
int sensor_linetime;
u64 readout_ns;
u32 err_state;
struct rkcif_err_state_work err_state_work;
struct rkcif_sensor_work sensor_work;