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

media: rockchip: isp: fix isp debug time for fe/fs irq together

Browse Source 
Change-Id: I527953193399c1a4de4da02dfb508f81e92b4daa
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2022-04-13 10:23:00 +08:00
committed by Tao Huang
parent b9d8b9f8d2
commit c3c0f230b0
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/platform/rockchip/isp/rkisp.c
View File

@@ -3573,15 +3573,6 @@ void rkisp_isp_isr(unsigned int isp_mis,
dev->isp_isr_cnt++;
/* start edge of v_sync */
if (isp_mis & CIF_ISP_V_START) {
if (dev->isp_state & ISP_FRAME_END) {
u64 tmp = dev->isp_sdev.dbg.interval +
dev->isp_sdev.dbg.timestamp;
dev->isp_sdev.dbg.timestamp = ktime_get_ns();
/* v-blank: frame_end - frame_start */
dev->isp_sdev.dbg.delay = dev->isp_sdev.dbg.timestamp - tmp;
}
rkisp_set_state(&dev->isp_state, ISP_FRAME_VS);
if (dev->hw_dev->monitor.is_en) {
rkisp_set_state(&dev->hw_dev->monitor.state, ISP_FRAME_VS);
if (!completion_done(&dev->hw_dev->monitor.cmpl))
@@ -3702,6 +3693,18 @@ vs_skip:
dev->isp_state &= ~ISP_ERROR;
}
if (isp_mis & CIF_ISP_V_START) {
if (dev->isp_state & ISP_FRAME_END) {
u64 tmp = dev->isp_sdev.dbg.interval +
dev->isp_sdev.dbg.timestamp;
dev->isp_sdev.dbg.timestamp = ktime_get_ns();
/* v-blank: frame(N)start - frame(N-1)end */
dev->isp_sdev.dbg.delay = dev->isp_sdev.dbg.timestamp - tmp;
}
rkisp_set_state(&dev->isp_state, ISP_FRAME_VS);
}
if ((isp_mis & (CIF_ISP_FRAME | si3a_isr_mask)) ||
(isp3a_mis & raw3a_isr_mask)) {
u32 irq = isp_mis;