TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: rockchip: vicap: rv1106 support hdr compress

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibac5d9205c01b4692d74289cbc5edc70c9d91f4d
This commit is contained in:
Zefa Chen
2022-02-24 10:14:25 +08:00
committed by Tao Huang
parent 84564f9c76
commit b0092eca95
4 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/media/platform/rockchip/cif/capture.c
+14 -8
View File
@@ -2138,7 +2138,7 @@ static void rkcif_csi_set_lvds_sav_eav(struct rkcif_stream *stream,
struct rkmodule_lvds_frm_sync_code *odd_sync_code = NULL;
struct rkmodule_lvds_frm_sync_code *even_sync_code = NULL;
if (dev->hdr.hdr_mode == NO_HDR) {
if (dev->hdr.hdr_mode == NO_HDR || dev->hdr.hdr_mode == HDR_COMPR) {
frm_sync_code = &lvds_cfg->frm_sync_code[LVDS_CODE_GRP_LINEAR];
odd_sync_code = &frm_sync_code->odd_sync_code;
even_sync_code = odd_sync_code;
@@ -2315,6 +2315,7 @@ static int rkcif_csi_channel_init(struct rkcif_stream *stream,
&dev->channels[stream->id]);
if (dev->hdr.hdr_mode == NO_HDR ||
dev->hdr.hdr_mode == HDR_COMPR ||
(dev->hdr.hdr_mode == HDR_X2 && stream->id > 1) ||
(dev->hdr.hdr_mode == HDR_X3 && stream->id > 2))
channel->vc = vc >= 0 ? vc : channel->id;
@@ -2746,7 +2747,8 @@ static int rkcif_csi_channel_set_v1(struct rkcif_stream *stream,
val |= stream->cif_fmt_in->csi_yuv_order;
val |= rkcif_csi_get_output_type_mask(stream);
if (stream->cifdev->hdr.hdr_mode == NO_HDR)
if (stream->cifdev->hdr.hdr_mode == NO_HDR ||
stream->cifdev->hdr.hdr_mode == HDR_COMPR)
val |= CSI_NO_HDR;
else if (stream->cifdev->hdr.hdr_mode == HDR_X2)
val |= CSI_HDR2;
@@ -3531,7 +3533,8 @@ void rkcif_do_stop_stream(struct rkcif_stream *stream,
vb2_buffer_done(&stream->next_buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
spin_unlock_irqrestore(&stream->vbq_lock, flags);
if (dev->hdr.hdr_mode != NO_HDR)
if (dev->hdr.hdr_mode == HDR_X2 ||
dev->hdr.hdr_mode == HDR_X3)
rkcif_release_rdbk_buf(stream);
stream->curr_buf = NULL;
@@ -6072,7 +6075,8 @@ void rkcif_vb_done_oneframe(struct rkcif_stream *stream,
stream->pixm.plane_fmt[i].sizeimage);
}
if (stream->cifdev->hdr.hdr_mode == NO_HDR)
if (stream->cifdev->hdr.hdr_mode == NO_HDR ||
stream->cifdev->hdr.hdr_mode == HDR_COMPR)
vb_done->vb2_buf.timestamp = ktime_get_ns();
vb2_buffer_done(&vb_done->vb2_buf, VB2_BUF_STATE_DONE);
@@ -6789,7 +6793,7 @@ static void rkcif_buf_done_prepare(struct rkcif_stream *stream,
vb_done->sequence /= 2;
}
if (cif_dev->hdr.hdr_mode == NO_HDR) {
if (cif_dev->hdr.hdr_mode == NO_HDR || cif_dev->hdr.hdr_mode == HDR_COMPR) {
if (stream->cif_fmt_in->field == V4L2_FIELD_INTERLACED) {
if (stream->frame_phase == CIF_CSI_FRAME1_READY && active_buf) {
if (stream->tools_vdev->state == RKCIF_STATE_STREAMING) {
@@ -6930,7 +6934,8 @@ static void rkcif_deal_readout_time(struct rkcif_stream *stream)
if (stream->id == RKCIF_STREAM_MIPI_ID0)
detect_stream->readout.readout_time = stream->readout.fe_timestamp - stream->readout.fs_timestamp;
if ((cif_dev->hdr.hdr_mode == NO_HDR) && (stream->id == RKCIF_STREAM_MIPI_ID0)) {
if ((cif_dev->hdr.hdr_mode == NO_HDR || cif_dev->hdr.hdr_mode == HDR_COMPR) &&
(stream->id == RKCIF_STREAM_MIPI_ID0)) {
detect_stream->readout.early_time = stream->readout.fe_timestamp - stream->readout.wk_timestamp;
} else if ((cif_dev->hdr.hdr_mode == HDR_X2) && (stream->id == RKCIF_STREAM_MIPI_ID1)) {
@@ -7371,7 +7376,7 @@ void rkcif_reset_watchdog_timer_handler(struct timer_list *t)
int ret, is_reset = 0;
struct rkmodule_vicap_reset_info rst_info;
if (dev->hdr.hdr_mode == NO_HDR) {
if (dev->hdr.hdr_mode == NO_HDR || dev->hdr.hdr_mode == HDR_COMPR) {
i = 0;
if (dev->stream[i].state != RKCIF_STATE_STREAMING)
goto end_detect;
@@ -7543,7 +7548,8 @@ static void rkcif_detect_wake_up_mode_change(struct rkcif_stream *stream)
stream->is_line_inten = true;
}
if (cif_dev->hdr.hdr_mode == NO_HDR && stream->id == RKCIF_STREAM_MIPI_ID0) {
if ((cif_dev->hdr.hdr_mode == NO_HDR || cif_dev->hdr.hdr_mode == HDR_COMPR) &&
stream->id == RKCIF_STREAM_MIPI_ID0) {
if (cif_dev->wait_line != cif_dev->wait_line_cache)
cif_dev->wait_line = cif_dev->wait_line_cache;
} else if (cif_dev->hdr.hdr_mode == HDR_X2 && stream->id == RKCIF_STREAM_MIPI_ID1) {
drivers/media/platform/rockchip/cif/dev.c
+1 -1
View File
@@ -993,7 +993,7 @@ static int rkcif_pipeline_set_stream(struct rkcif_pipeline *p, bool on)
bool can_be_set = false;
int i, ret;
if (cif_dev->hdr.hdr_mode == NO_HDR) {
if (cif_dev->hdr.hdr_mode == NO_HDR || cif_dev->hdr.hdr_mode == HDR_COMPR) {
if ((on && atomic_inc_return(&p->stream_cnt) > 1) ||
(!on && atomic_dec_return(&p->stream_cnt) > 0))
return 0;
drivers/media/platform/rockchip/cif/procfs.c
+3 -1
View File
@@ -290,6 +290,7 @@ static void rkcif_show_format(struct rkcif_device *dev, struct seq_file *f)
seq_printf(f, "\thdr mode: %s\n",
dev->hdr.hdr_mode == NO_HDR ? "normal" :
dev->hdr.hdr_mode == HDR_COMPR ? "hdr_compr" :
dev->hdr.hdr_mode == HDR_X2 ? "hdr_x2" : "hdr_x3");
seq_printf(f, "\tformat:%s/%ux%u@%d\n",
@@ -319,7 +320,8 @@ static void rkcif_show_format(struct rkcif_device *dev, struct seq_file *f)
if (dev->inf_id == RKCIF_MIPI_LVDS) {
time_val = div_u64(stream->readout.early_time, 1000000);
seq_printf(f, "\tearly:%u ms\n", time_val);
if (dev->hdr.hdr_mode == NO_HDR) {
if (dev->hdr.hdr_mode == NO_HDR ||
dev->hdr.hdr_mode == HDR_COMPR) {
time_val = div_u64(stream->readout.readout_time, 1000000);
seq_printf(f, "\treadout:%u ms\n", time_val);
} else {
drivers/media/platform/rockchip/cif/subdev-itf.c
+11 -5
View File
@@ -134,7 +134,8 @@ static int sditf_get_set_fmt(struct v4l2_subdev *sd,
v4l2_dbg(3, rkcif_debug, &cif_dev->v4l2_dev,
"%s, width %d, height %d, hdr mode %d\n",
__func__, fmt->format.width, fmt->format.height, priv->hdr_cfg.hdr_mode);
if (priv->hdr_cfg.hdr_mode == NO_HDR) {
if (priv->hdr_cfg.hdr_mode == NO_HDR ||
priv->hdr_cfg.hdr_mode == HDR_COMPR) {
rkcif_set_fmt(&cif_dev->stream[0], &pixm, false);
} else if (priv->hdr_cfg.hdr_mode == HDR_X2) {
rkcif_set_fmt(&cif_dev->stream[0], &pixm, false);
@@ -351,7 +352,8 @@ static int sditf_channel_enable(struct sditf_priv *priv, int user)
unsigned int width = priv->cap_info.width;
unsigned int height = priv->cap_info.height;
if (priv->hdr_cfg.hdr_mode == NO_HDR) {
if (priv->hdr_cfg.hdr_mode == NO_HDR ||
priv->hdr_cfg.hdr_mode == HDR_COMPR) {
if (cif_dev->inf_id == RKCIF_MIPI_LVDS)
ch0 = cif_dev->csi_host_idx * 4;
else
@@ -436,7 +438,8 @@ static void sditf_channel_disable(struct sditf_priv *priv, int user)
struct rkcif_device *cif_dev = priv->cif_dev;
unsigned int ctrl_val = 0;
if (priv->hdr_cfg.hdr_mode == NO_HDR) {
if (priv->hdr_cfg.hdr_mode == NO_HDR ||
priv->hdr_cfg.hdr_mode == HDR_COMPR) {
if (user == 0)
ctrl_val = CIF_TOISP0_FE(0);
else
@@ -479,7 +482,8 @@ static int sditf_start_stream(struct sditf_priv *priv)
sditf_channel_enable(priv, 1);
}
if (priv->hdr_cfg.hdr_mode == NO_HDR) {
if (priv->hdr_cfg.hdr_mode == NO_HDR ||
priv->hdr_cfg.hdr_mode == HDR_COMPR) {
rkcif_do_start_stream(&cif_dev->stream[0], RKCIF_STREAM_MODE_TOISP);
} else if (priv->hdr_cfg.hdr_mode == HDR_X2) {
rkcif_do_start_stream(&cif_dev->stream[0], RKCIF_STREAM_MODE_TOISP);
@@ -504,7 +508,9 @@ static int sditf_stop_stream(struct sditf_priv *priv)
sditf_channel_disable(priv, 0);
sditf_channel_disable(priv, 1);
}
if (priv->hdr_cfg.hdr_mode == NO_HDR) {
if (priv->hdr_cfg.hdr_mode == NO_HDR ||
priv->hdr_cfg.hdr_mode == HDR_COMPR) {
rkcif_do_stop_stream(&cif_dev->stream[0], RKCIF_STREAM_MODE_TOISP);
} else if (priv->hdr_cfg.hdr_mode == HDR_X2) {
rkcif_do_stop_stream(&cif_dev->stream[0], RKCIF_STREAM_MODE_TOISP);