shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: platform: rockchip: cif: set stopping time out as fps when reset cif

Browse Source 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I1376766c27ba08453a6d2b93ea5a5a3d188a1c42
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
This commit is contained in:
Allon Huang
2021-05-20 14:13:32 +08:00
committed by Zefa Chen
parent f5cc594e92
commit 544e61d0d1
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4730,8 +4730,10 @@ static int rkcif_do_reset_work(struct rkcif_device *cif_dev,
struct rkcif_stream *resume_stream[RKCIF_MAX_STREAM_MIPI] = { NULL };
struct rkcif_sensor_info *terminal_sensor = &cif_dev->terminal_sensor;
struct rkcif_resume_info *resume_info = &cif_dev->reset_work.resume_info;
struct rkcif_timer *timer = &cif_dev->reset_watchdog_timer;
int i, j, ret = 0;
u32 on, sof_cnt;
u64 fps;
mutex_lock(&cif_dev->stream_lock);
@@ -4740,6 +4742,7 @@ static int rkcif_do_reset_work(struct rkcif_device *cif_dev,
v4l2_dbg(1, rkcif_debug, &cif_dev->v4l2_dev, "do rkcif reset\n");
fps = div_u64(timer->frame_end_cycle_us, 1000);
for (i = 0, j = 0; i < RKCIF_MAX_STREAM_MIPI; i++) {
stream = &cif_dev->stream[i];
@@ -4752,7 +4755,7 @@ static int rkcif_do_reset_work(struct rkcif_device *cif_dev,
ret = wait_event_timeout(stream->wq_stopped,
stream->state != RKCIF_STATE_STREAMING,
msecs_to_jiffies(1000));
msecs_to_jiffies(fps));
if (!ret) {
rkcif_stream_stop(stream);
stream->stopping = false;
@@ -4885,7 +4888,7 @@ unlock_stream:
return ret;
}
static void rkcif_reset_work(struct work_struct *work)
void rkcif_reset_work(struct work_struct *work)
{
struct rkcif_work_struct *reset_work = container_of(work,
struct rkcif_work_struct,
@@ -4893,12 +4896,14 @@ static void rkcif_reset_work(struct work_struct *work)
struct rkcif_device *dev = container_of(reset_work,
struct rkcif_device,
reset_work);
struct rkcif_timer *timer = &dev->reset_watchdog_timer;
int ret;
ret = rkcif_do_reset_work(dev, reset_work->reset_src);
if (ret)
v4l2_info(&dev->v4l2_dev, "do reset work failed!\n");
timer->has_been_init = false;
}
static bool rkcif_is_reduced_frame_rate(struct rkcif_device *dev)
@@ -4970,6 +4975,9 @@ static void rkcif_init_reset_work(struct rkcif_timer *timer)
reset_watchdog_timer);
unsigned long lock_flags = 0;
if (timer->has_been_init)
return;
v4l2_info(&dev->v4l2_dev,
"do reset work schedule, run_cnt:%d, reset source:%d\n",
timer->run_cnt, timer->reset_src);
@@ -4985,14 +4993,14 @@ static void rkcif_init_reset_work(struct rkcif_timer *timer)
spin_unlock_irqrestore(&timer->timer_lock, lock_flags);
dev->reset_work.reset_src = timer->reset_src;
INIT_WORK(&dev->reset_work.work, rkcif_reset_work);
if (schedule_work(&dev->reset_work.work))
v4l2_err(&dev->v4l2_dev,
if (schedule_work(&dev->reset_work.work)) {
timer->has_been_init = true;
v4l2_info(&dev->v4l2_dev,
"schedule reset work successfully\n");
else
v4l2_err(&dev->v4l2_dev,
} else {
v4l2_info(&dev->v4l2_dev,
"schedule reset work failed\n");
}
}
void rkcif_reset_watchdog_timer_handler(struct timer_list *t)
@@ -5063,7 +5071,7 @@ void rkcif_reset_watchdog_timer_handler(struct timer_list *t)
if (is_reset) {
rkcif_init_reset_work(timer);
return;
return;
}
if (timer->monitor_mode == RKCIF_MONITOR_MODE_CONTINUE ||

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

@@ -1008,7 +1008,7 @@ static void rkcif_init_reset_monitor(struct rkcif_device *dev)
notifier->priority = 1;
notifier->notifier_call = rkcif_reset_notifier;
rkcif_csi2_register_notifier(notifier);
INIT_WORK(&dev->reset_work.work, rkcif_reset_work);
}
int rkcif_plat_init(struct rkcif_device *cif_dev, struct device_node *node, int inf_id)

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

@@ -363,6 +363,7 @@ struct rkcif_timer {
bool is_buf_stop_update;
bool is_running;
bool is_csi2_err_occurred;
bool has_been_init;
enum rkcif_monitor_mode monitor_mode;
enum rkmodule_reset_src reset_src;
};
@@ -562,5 +563,5 @@ void rkcif_reset_watchdog_timer_handler(struct timer_list *t);
void rkcif_config_dvp_clk_sampling_edge(struct rkcif_device *dev,
enum rkcif_clk_edge edge);
void rkcif_enable_dvp_clk_dual_edge(struct rkcif_device *dev, bool on);
void rkcif_reset_work(struct work_struct *work);
#endif