github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: rockchip: isp: ctrl the fps for isp32

Browse Source 
Change-Id: Ia2d780d263bc14327527b9e87607a823f1e7936f
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
This commit is contained in:
Lian Xu 2022-03-24 15:29:21 +08:00 committed by Tao Huang
parent ffc8225221
commit b0127db292
6 changed files with 166 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/platform/rockchip/isp/capture.c
View File

@ -1457,6 +1457,28 @@ static int rkisp_set_wrap_line(struct rkisp_stream *stream, int *line)
return 0;
}
static int rkisp_set_fps(struct rkisp_stream *stream, int *fps)
{
struct rkisp_device *dev = stream->ispdev;
if (dev->isp_ver != ISP_V32)
return -EINVAL;
rkisp_rockit_fps_set(fps, stream->id);
return 0;
}
static int rkisp_get_fps(struct rkisp_stream *stream, int *fps)
{
struct rkisp_device *dev = stream->ispdev;
if (dev->isp_ver != ISP_V32)
return -EINVAL;
rkisp_rockit_fps_get(fps, stream->id);
return 0;
}
static long rkisp_ioctl_default(struct file *file, void *fh,
bool valid_prio, unsigned int cmd, void *arg)
{
@ -1515,6 +1537,12 @@ static long rkisp_ioctl_default(struct file *file, void *fh,
case RKISP_CMD_SET_WRAP_LINE:
ret = rkisp_set_wrap_line(stream, arg);
break;
case RKISP_CMD_SET_FPS:
ret = rkisp_set_fps(stream, arg);
break;
case RKISP_CMD_GET_FPS:
ret = rkisp_get_fps(stream, arg);
break;
default:
ret = -EINVAL;
}

6
drivers/media/platform/rockchip/isp/capture_v32.c
View File

@ -992,10 +992,10 @@ static int mi_frame_start(struct rkisp_stream *stream, u32 mis)
{
unsigned long lock_flags = 0;
if (stream->ispdev->cap_dev.wrap_line &&
stream->id == RKISP_STREAM_MP &&
stream->streaming && mis != 0)
if (mis && stream->streaming) {
rkisp_rockit_buf_done(stream, ROCKIT_DVBM_START);
rkisp_rockit_ctrl_fps(stream);
}
/* readback start to update stream buf if null */
spin_lock_irqsave(&stream->vbq_lock, lock_flags);

6
drivers/media/platform/rockchip/isp/capture_v3x.h
View File

@ -28,6 +28,9 @@ void rkisp_mipi_v32_isr(u32 phy, u32 packet, u32 overflow, u32 state, struct rki
int rkisp_rockit_buf_free(struct rkisp_stream *stream);
void rkisp_rockit_dev_init(struct rkisp_device *dev);
bool rkisp_rockit_ctrl_fps(struct rkisp_stream *stream);
void rkisp_rockit_fps_set(int *dst_fps, unsigned int id);
void rkisp_rockit_fps_get(int *dst_fps, unsigned int id);
int rkisp_rockit_buf_done(struct rkisp_stream *stream, int cmd);
#else
static inline int rkisp_register_stream_v32(struct rkisp_device *dev) { return -EINVAL; }
@ -37,6 +40,9 @@ static inline void rkisp_mipi_v32_isr(u32 phy, u32 packet, u32 overflow, u32 sta
static inline int rkisp_rockit_buf_free(struct rkisp_stream *stream) { return -EINVAL; }
static inline void rkisp_rockit_dev_init(struct rkisp_device *dev) { return; }
static inline bool rkisp_rockit_ctrl_fps(struct rkisp_stream *stream) { return false; }
static inline void rkisp_rockit_fps_set(int *dst_fps, unsigned int id) { return; }
static inline void rkisp_rockit_fps_get(int *dst_fps, unsigned int id) { return; }
static inline int rkisp_rockit_buf_done(struct rkisp_stream *stream, int cmd) { return -EINVAL; }
#endif

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

@ -178,6 +178,9 @@ int rkisp_rockit_buf_queue(struct rockit_cfg *input_rockit_cfg)
"stream:%d rockit_queue buf:0x%x\n",
stream->id, isprk_buf->isp_buf.buff_addr[0]);
if (stream_cfg->is_discard && stream->streaming)
return -EINVAL;
spin_lock_irqsave(&stream->vbq_lock, lock_flags);
/* single sensor with pingpong buf, update next if need */
if (stream->ispdev->hw_dev->is_single &&
@ -207,7 +210,7 @@ int rkisp_rockit_buf_done(struct rkisp_stream *stream, int cmd)
return -EINVAL;
}
if (stream->curr_buf != NULL) {
if (cmd == ROCKIT_DVBM_END) {
isprk_buf =
container_of(stream->curr_buf, struct rkisp_rockit_buffer, isp_buf);
@ -217,6 +220,21 @@ int rkisp_rockit_buf_done(struct rkisp_stream *stream, int cmd)
rockit_cfg->frame.u32TimeRef = stream->curr_buf->vb.sequence;
} else {
if (stream->ispdev->cap_dev.wrap_line &&
stream->id == RKISP_STREAM_MP) {
if (stream_cfg->is_discard)
return 0;
} else if (stream_cfg->dst_fps) {
if (!stream_cfg->is_discard && !stream->curr_buf) {
rockit_cfg->is_qbuf = true;
} else {
rockit_cfg->is_qbuf = false;
return 0;
}
} else {
return 0;
}
rkisp_dmarx_get_frame(stream->ispdev, &seq, NULL, &ns, true);
if (!ns)
@ -261,6 +279,8 @@ int rkisp_rockit_buf_free(struct rkisp_stream *stream)
const struct vb2_mem_ops *g_ops = stream->ispdev->hw_dev->mem_ops;
struct rkisp_stream_cfg *stream_cfg = &rockit_cfg->rkisp_stream_cfg[stream->id];
stream_cfg->is_discard = false;
for (i = 0; i < ROCKIT_BUF_NUM_MAX; i++) {
if (stream_cfg->rkisp_buff[i]) {
isprk_buf = (struct rkisp_rockit_buffer *)stream_cfg->rkisp_buff[i];
@ -297,6 +317,103 @@ void rkisp_rockit_dev_init(struct rkisp_device *dev)
}
}
void rkisp_rockit_fps_set(int *dst_fps, unsigned int id)
{
if (id >= ROCKIT_STREAM_NUM_MAX) {
pr_err("fps_set stream id %u exceeds maximum\n", id);
return;
}
if (dst_fps == NULL) {
pr_err("fps_set dst_fps is null\n");
return;
}
rockit_cfg->rkisp_stream_cfg[id].dst_fps = *dst_fps;
rockit_cfg->rkisp_stream_cfg[id].fps_cnt = *dst_fps;
}
void rkisp_rockit_fps_get(int *dst_fps, unsigned int id)
{
if (id >= ROCKIT_STREAM_NUM_MAX) {
pr_err("fps_get stream id %u exceeds maximum\n", id);
return;
}
if (dst_fps == NULL) {
pr_err("fps_get dst_fps is null\n");
return;
}
*dst_fps = rockit_cfg->rkisp_stream_cfg[id].cur_fps;
}
bool rkisp_rockit_ctrl_fps(struct rkisp_stream *stream)
{
struct rkisp_device *dev = stream->ispdev;
struct rkisp_sensor_info *sensor = NULL;
int *fps_cnt = &rockit_cfg->rkisp_stream_cfg[stream->id].fps_cnt;
int ret, dst_fps;
static int fps_in, cur_fps[ROCKIT_STREAM_NUM_MAX];
u32 denominator = 0, numerator = 0;
bool *is_discard = &rockit_cfg->rkisp_stream_cfg[stream->id].is_discard;
u64 cur_time, *old_time = &rockit_cfg->rkisp_stream_cfg[stream->id].old_time;
dst_fps = rockit_cfg->rkisp_stream_cfg[stream->id].dst_fps;
if (dst_fps == 0 || !stream->streaming) {
*is_discard = false;
return false;
}
if (dev->active_sensor == NULL) {
*is_discard = false;
pr_err("the sensor is not found\n");
return false;
}
sensor = dev->active_sensor;
ret = v4l2_subdev_call(sensor->sd, video, g_frame_interval, &sensor->fi);
if (!ret) {
denominator = sensor->fi.interval.denominator;
numerator = sensor->fi.interval.numerator;
if (numerator)
fps_in = denominator / numerator;
else {
*is_discard = false;
pr_err("the numerator is 0\n");
return false;
}
}
if (dst_fps >= fps_in)
return false;
if ((fps_in > 0) && (dst_fps > 0)) {
if (*fps_cnt < 0)
*fps_cnt = fps_in - dst_fps;
*fps_cnt += dst_fps;
if (*fps_cnt < fps_in)
*is_discard = true;
else {
*fps_cnt -= fps_in;
*is_discard = false;
++cur_fps[stream->id];
cur_time = ktime_get_ns();
if (cur_time - *old_time >= 1000000000) {
*old_time = cur_time;
rockit_cfg->rkisp_stream_cfg[stream->id].cur_fps =
cur_fps[stream->id];
cur_fps[stream->id] = 0;
}
}
} else {
*is_discard = false;
}
return true;
}
void *rkisp_rockit_function_register(void *function, int cmd)
{
if (rockit_cfg == NULL) {

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

@ -20,6 +20,11 @@ struct rkisp_stream_cfg {
struct rkisp_rockit_buffer *rkisp_buff[ROCKIT_BUF_NUM_MAX];
int buff_id[ROCKIT_BUF_NUM_MAX];
void *node;
int fps_cnt;
int dst_fps;
int cur_fps;
u64 old_time;
bool is_discard;
};
struct ISP_VIDEO_FRAMES {
@ -49,6 +54,7 @@ struct rkisp_dev_cfg {
struct rockit_cfg {
bool is_alloc;
bool is_empty;
bool is_qbuf;
char *current_name;
dma_addr_t dma_addr;
int *buff_id;

5
include/uapi/linux/rkisp2-config.h
View File

@ -79,6 +79,11 @@
#define RKISP_CMD_SET_WRAP_LINE \
_IOW('V', BASE_VIDIOC_PRIVATE + 108, int)
#define RKISP_CMD_SET_FPS \
_IOW('V', BASE_VIDIOC_PRIVATE + 109, int)
#define RKISP_CMD_GET_FPS \
_IOR('V', BASE_VIDIOC_PRIVATE + 110, int)
/*************************************************************/
#define ISP2X_ID_DPCC (0)