From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/drivers/media/platform/rockchip/cif/dev.h | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/cif/dev.h b/kernel/drivers/media/platform/rockchip/cif/dev.h
index a23d20a..d995f58 100644
--- a/kernel/drivers/media/platform/rockchip/cif/dev.h
+++ b/kernel/drivers/media/platform/rockchip/cif/dev.h
@@ -193,6 +193,7 @@
struct rkcif_tools_buffer {
struct vb2_v4l2_buffer *vb;
+ struct rkisp_rx_buf *dbufs;
struct list_head list;
u32 frame_idx;
u64 timestamp;
@@ -279,10 +280,12 @@
unsigned int width;
unsigned int height;
unsigned int virtual_width;
+ unsigned int left_virtual_width;
unsigned int crop_st_x;
unsigned int crop_st_y;
unsigned int dsi_input;
struct rkmodule_lvds_cfg lvds_cfg;
+ struct rkmodule_capture_info capture_info;
};
struct rkcif_vdev_node {
@@ -526,7 +529,7 @@
unsigned int cur_stream_mode;
struct rkcif_rx_buffer rx_buf[RKISP_VICAP_BUF_CNT_MAX];
struct list_head rx_buf_head;
- int buf_num_toisp;
+ int total_buf_num;
u64 line_int_cnt;
int lack_buf_cnt;
unsigned int buf_wake_up_cnt;
@@ -536,6 +539,7 @@
int last_rx_buf_idx;
int last_frame_idx;
int new_fource_idx;
+ atomic_t buf_cnt;
bool stopping;
bool crop_enable;
bool crop_dyn_en;
@@ -552,6 +556,7 @@
bool is_in_vblank;
bool is_change_toisp;
bool is_stop_capture;
+ bool is_wait_dma_stop;
};
struct rkcif_lvds_subdev {
@@ -841,6 +846,7 @@
struct rkcif_work_struct reset_work;
int id_use_cnt;
unsigned int csi_host_idx;
+ unsigned int csi_host_idx_def;
unsigned int dvp_sof_in_oneframe;
unsigned int wait_line;
unsigned int wait_line_bak;
@@ -883,7 +889,7 @@
int rkcif_scale_start(struct rkcif_scale_vdev *scale_vdev);
const struct
-cif_input_fmt *get_input_fmt(struct v4l2_subdev *sd,
+cif_input_fmt *rkcif_get_input_fmt(struct rkcif_device *dev,
struct v4l2_rect *rect,
u32 pad_id, struct csi_channel_info *csi_info);
--
Gitblit v1.6.2