From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/media/platform/rockchip/isp/dmarx.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/isp/dmarx.c b/kernel/drivers/media/platform/rockchip/isp/dmarx.c
index 529c099..1f1c028 100644
--- a/kernel/drivers/media/platform/rockchip/isp/dmarx.c
+++ b/kernel/drivers/media/platform/rockchip/isp/dmarx.c
@@ -1156,9 +1156,10 @@
u64 sof_time = 0, frame_timestamp = 0;
u32 frame_id = 0;
- if (!IS_HDR_RDBK(dev->rd_mode) && id) {
- *id = atomic_read(&dev->isp_sdev.frm_sync_seq) - 1;
- return;
+ if (!IS_HDR_RDBK(dev->rd_mode)) {
+ frame_id = atomic_read(&dev->isp_sdev.frm_sync_seq) - 1;
+ frame_timestamp = dev->isp_sdev.frm_timestamp;
+ goto end;
}
spin_lock_irqsave(&dev->rdbk_lock, flag);
@@ -1172,6 +1173,7 @@
frame_timestamp = dev->dmarx_dev.pre_frame.timestamp;
}
spin_unlock_irqrestore(&dev->rdbk_lock, flag);
+end:
if (id)
*id = frame_id;
if (sof_timestamp)
--
Gitblit v1.6.2