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/bridge_v20.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/drivers/media/platform/rockchip/isp/bridge_v20.c b/kernel/drivers/media/platform/rockchip/isp/bridge_v20.c index c637b00..75184a3 100644 --- a/kernel/drivers/media/platform/rockchip/isp/bridge_v20.c +++ b/kernel/drivers/media/platform/rockchip/isp/bridge_v20.c @@ -669,7 +669,7 @@ struct rkisp_hw_dev *hw = ispdev->hw_dev; struct v4l2_subdev *sd = v4l2_get_subdev_hostdata(&dev->sd); unsigned long lock_flags = 0; - u64 ns = ktime_get_ns(); + u64 ns = rkisp_time_get_ns(ispdev); struct rkisp_bridge_buf *buf; u32 val; @@ -711,7 +711,7 @@ if (!sof_ns) sof_ns = 0; if (!ns) - ns = ktime_get_ns(); + ns = rkisp_time_get_ns(ispdev); hw->cur_buf->frame_timestamp = ns; hw->cur_buf->index = ispdev->dev_id; v4l2_subdev_call(sd, core, ioctl, RKISP_ISPP_CMD_REQUEST_REGBUF, @@ -744,11 +744,11 @@ buf = to_bridge_buf(hw->cur_buf); vaddr = buf->dummy[GROUP_BUF_PIC].vaddr; size = buf->dummy[GROUP_BUF_PIC].size; - *(u64 *)(vaddr + size / 4 - 2) = ktime_get_ns(); + *(u64 *)(vaddr + size / 4 - 2) = rkisp_time_get_ns(ispdev); vaddr = buf->dummy[GROUP_BUF_GAIN].vaddr; size = buf->dummy[GROUP_BUF_GAIN].size; - *(u64 *)(vaddr + size / 4 - 2) = ktime_get_ns(); + *(u64 *)(vaddr + size / 4 - 2) = rkisp_time_get_ns(ispdev); hw->cur_buf->mfbc_dmaidx = hw->cur_buf->didx[GROUP_BUF_PIC]; hw->cur_buf->gain_dmaidx = hw->cur_buf->didx[GROUP_BUF_GAIN]; hw->cur_buf->is_move_judge = true; -- Gitblit v1.6.2