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

media: rockchip: isp: add attach info for isp35

Browse Source 
Change-Id: I4e5829367cf21ecdd5b7e1d03fecfa7479cecb90
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2025-04-01 11:19:56 +08:00
parent b5fd7789c8
commit 5a44afbcdf
3 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/media/platform/rockchip/isp/capture_v35.c
View File

@@ -910,7 +910,7 @@ static int mi_frame_end(struct rkisp_stream *stream, u32 state)
struct capture_fmt *isp_fmt = &stream->out_isp_fmt;
unsigned long lock_flags = 0;
struct rkisp_buffer *buf = NULL;
u32 i;
u32 i, seq;
/* STREAM_VIR or STREAM_MP wrap buf from rockit */
if (stream->id == RKISP_STREAM_VIR ||
@@ -955,22 +955,50 @@ static int mi_frame_end(struct rkisp_stream *stream, u32 state)
goto end;
}
rkisp_dmarx_get_frame(dev, &seq, NULL, &ns, !dev->is_aiisp_en);
if (!ns)
ns = rkisp_time_get_ns(dev);
for (i = 0; i < isp_fmt->mplanes; i++) {
u32 payload_size = stream->out_fmt.plane_fmt[i].sizeimage;
vb2_set_plane_payload(vb2_buf, i, payload_size);
if (stream->is_attach_info &&
vb2_buf->memory && i == isp_fmt->mplanes - 1) {
struct rkisp_frame_info *info = buf->vaddr[i] + payload_size;
struct sensor_exposure_cfg *exp = &dev->params_vdev.exposure;
info->seq = seq;
info->hdr = dev->params_vdev.is_hdr;
info->timestamp = IS_HDR_RDBK(dev->rd_mode) ? ns : dev->vicap_sof.timestamp;
info->rolling_shutter_skew = exp->linear_exp.rolling_shutter_skew;
info->sensor_exposure_time = exp->linear_exp.coarse_integration_time;
info->sensor_analog_gain = exp->linear_exp.analog_gain_code_global;
info->sensor_digital_gain = exp->linear_exp.digital_gain_global;
info->isp_digital_gain = exp->linear_exp.isp_digital_gain;
if (info->hdr) {
info->rolling_shutter_skew = exp->hdr_exp[0].rolling_shutter_skew;
info->sensor_exposure_time = exp->hdr_exp[0].coarse_integration_time;
info->sensor_analog_gain = exp->hdr_exp[0].analog_gain_code_global;
info->sensor_digital_gain = exp->hdr_exp[0].digital_gain_global;
info->isp_digital_gain = exp->hdr_exp[0].isp_digital_gain;
info->sensor_exposure_time_l = exp->hdr_exp[1].coarse_integration_time;
info->sensor_analog_gain_l = exp->hdr_exp[1].analog_gain_code_global;
info->sensor_digital_gain_l = exp->hdr_exp[1].digital_gain_global;
info->isp_digital_gain_l = exp->hdr_exp[1].isp_digital_gain;
}
}
}
rkisp_dmarx_get_frame(dev, &i, NULL, &ns, !dev->is_aiisp_en);
if (!ns)
ns = rkisp_time_get_ns(dev);
buf->vb.sequence = i;
buf->vb.sequence = seq;
vb2_buf->timestamp = ns;
ns = rkisp_time_get_ns(dev);
stream->dbg.interval = ns - stream->dbg.timestamp;
stream->dbg.delay = ns - vb2_buf->timestamp;
stream->dbg.timestamp = ns;
stream->dbg.id = i;
stream->dbg.id = seq;
if (vir->streaming && vir->conn_id == stream->id) {
spin_lock_irqsave(&vir->vbq_lock, lock_flags);
@@ -1120,6 +1148,9 @@ static int rkisp_queue_setup(struct vb2_queue *queue,
plane_fmt->sizeimage / height *
ALIGN(height, 16) :
plane_fmt->sizeimage;
/* attach information size */
if (stream->is_attach_info && i == isp_fmt->mplanes - 1)
sizes[i] += sizeof(struct rkisp_frame_info);
}
rkisp_chk_tb_over(dev);

26
drivers/media/platform/rockchip/isp/isp_rockit.c
View File

@@ -320,6 +320,32 @@ int rkisp_rockit_buf_done(struct rkisp_stream *stream, int cmd, struct rkisp_buf
ISP33_ISP2ENC_FRM_CNT(rkisp_read(dev, ISP3X_ISP_DEBUG1, true));
}
if (stream->is_attach_info) {
struct sensor_exposure_cfg *exp = &dev->params_vdev.exposure;
if (!IS_HDR_RDBK(dev->rd_mode))
rockit_cfg->frame.u64PTS = dev->vicap_sof.timestamp;
rockit_cfg->frame.hdr = dev->params_vdev.is_hdr;
rockit_cfg->frame.rolling_shutter_skew = exp->linear_exp.rolling_shutter_skew;
rockit_cfg->frame.sensor_exposure_time = exp->linear_exp.coarse_integration_time;
rockit_cfg->frame.sensor_analog_gain = exp->linear_exp.analog_gain_code_global;
rockit_cfg->frame.sensor_digital_gain = exp->linear_exp.digital_gain_global;
rockit_cfg->frame.isp_digital_gain = exp->linear_exp.isp_digital_gain;
if (rockit_cfg->frame.hdr) {
rockit_cfg->frame.rolling_shutter_skew = exp->hdr_exp[0].rolling_shutter_skew;
rockit_cfg->frame.sensor_exposure_time = exp->hdr_exp[0].coarse_integration_time;
rockit_cfg->frame.sensor_analog_gain = exp->hdr_exp[0].analog_gain_code_global;
rockit_cfg->frame.sensor_digital_gain = exp->hdr_exp[0].digital_gain_global;
rockit_cfg->frame.isp_digital_gain = exp->hdr_exp[0].isp_digital_gain;
rockit_cfg->frame.sensor_exposure_time_l = exp->hdr_exp[1].coarse_integration_time;
rockit_cfg->frame.sensor_analog_gain_l = exp->hdr_exp[1].analog_gain_code_global;
rockit_cfg->frame.sensor_digital_gain_l = exp->hdr_exp[1].digital_gain_global;
rockit_cfg->frame.isp_digital_gain_l = exp->hdr_exp[1].isp_digital_gain;
}
}
rockit_cfg->is_color = !rkisp_read(dev, ISP3X_IMG_EFF_CTRL, true);
rockit_cfg->frame.u32Height = stream->out_fmt.height;

18
include/soc/rockchip/rockchip_rockit.h
View File

@@ -57,6 +57,24 @@ struct ISP_VIDEO_FRAMES {
u64 u64PrivateData;
u32 u32FrameFlag; /* FRAME_FLAG_E, can be OR operation. */
u8 ispEncCnt;
u32 hdr;
u32 rolling_shutter_skew;
/* linear or hdr short frame */
u32 sensor_exposure_time;
u32 sensor_analog_gain;
u32 sensor_digital_gain;
u32 isp_digital_gain;
/* hdr mid-frame */
u32 sensor_exposure_time_m;
u32 sensor_analog_gain_m;
u32 sensor_digital_gain_m;
u32 isp_digital_gain_m;
/* hdr long frame */
u32 sensor_exposure_time_l;
u32 sensor_analog_gain_l;
u32 sensor_digital_gain_l;
u32 isp_digital_gain_l;
};
struct rkisp_dev_cfg {