From 08f87f769b595151be1afeff53e144f543faa614 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 06 Dec 2023 09:51:13 +0000
Subject: [PATCH] add dts config
---
kernel/drivers/media/platform/rockchip/isp/isp_stats_v21.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/isp/isp_stats_v21.c b/kernel/drivers/media/platform/rockchip/isp/isp_stats_v21.c
index c51e823..cb835ee 100644
--- a/kernel/drivers/media/platform/rockchip/isp/isp_stats_v21.c
+++ b/kernel/drivers/media/platform/rockchip/isp/isp_stats_v21.c
@@ -33,6 +33,14 @@
#define ISP2X_RAWAF_INT_LINE0_EN BIT(27)
+static void isp_module_done(struct rkisp_isp_stats_vdev *stats_vdev,
+ u32 reg, u32 value)
+{
+ void __iomem *base = stats_vdev->dev->hw_dev->base_addr;
+
+ writel(value, base + reg);
+}
+
static int
rkisp_stats_get_rawawb_meas_reg(struct rkisp_isp_stats_vdev *stats_vdev,
struct rkisp_isp21_stat_buffer *pbuf)
@@ -789,7 +797,7 @@
value = rkisp_read(stats_vdev->dev, ISP21_RAWAWB_CTRL, true);
if (value & ISP2X_3A_MEAS_DONE)
- rkisp_write(stats_vdev->dev, ISP21_RAWAWB_CTRL, value, true);
+ isp_module_done(stats_vdev, ISP21_RAWAWB_CTRL, value);
return 0;
}
@@ -800,8 +808,8 @@
value = rkisp_read(stats_vdev->dev, ISP_RAWAF_CTRL, true);
if (value & ISP2X_3A_MEAS_DONE) {
- rkisp_write(stats_vdev->dev, ISP_RAWAF_CTRL, value, true);
rkisp_write(stats_vdev->dev, ISP_RAWAF_INT_STATE, 0, true);
+ isp_module_done(stats_vdev, ISP_RAWAF_CTRL, value);
}
return 0;
}
@@ -828,7 +836,7 @@
value = rkisp_read(stats_vdev->dev, addr + RAWAE_BIG_CTRL, true);
if (value & ISP2X_3A_MEAS_DONE)
- rkisp_write(stats_vdev->dev, addr + RAWAE_BIG_CTRL, value, true);
+ isp_module_done(stats_vdev, addr + RAWAE_BIG_CTRL, value);
return 0;
}
@@ -854,7 +862,7 @@
value = rkisp_read(stats_vdev->dev, addr + ISP_RAWHIST_BIG_CTRL, true);
if (value & ISP2X_3A_MEAS_DONE)
- rkisp_write(stats_vdev->dev, addr + ISP_RAWHIST_BIG_CTRL, value, true);
+ isp_module_done(stats_vdev, addr + ISP_RAWHIST_BIG_CTRL, value);
return 0;
}
@@ -901,7 +909,7 @@
value = rkisp_read(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, true);
if (value & ISP2X_3A_MEAS_DONE)
- rkisp_write(stats_vdev->dev, ISP_RAWAE_LITE_CTRL, value, true);
+ isp_module_done(stats_vdev, ISP_RAWAE_LITE_CTRL, value);
return 0;
}
@@ -912,7 +920,7 @@
value = rkisp_read(stats_vdev->dev, ISP_RAWHIST_LITE_CTRL, true);
if (value & ISP2X_3A_MEAS_DONE)
- rkisp_write(stats_vdev->dev, ISP_RAWHIST_LITE_CTRL, value, true);
+ isp_module_done(stats_vdev, ISP_RAWHIST_LITE_CTRL, value);
return 0;
}
@@ -940,6 +948,7 @@
struct rkisp_isp21_stat_buffer *cur_stat_buf = NULL;
struct rkisp_stats_v21_ops *ops =
(struct rkisp_stats_v21_ops *)stats_vdev->priv_ops;
+ struct rkisp_isp_params_vdev *params_vdev = &stats_vdev->dev->params_vdev;
int ret = 0;
cur_frame_id = meas_work->frame_id;
@@ -958,6 +967,7 @@
cur_stat_buf =
(struct rkisp_isp21_stat_buffer *)(cur_buf->vaddr[0]);
cur_stat_buf->frame_id = cur_frame_id;
+ cur_stat_buf->params_id = params_vdev->cur_frame_id;
}
if (meas_work->isp_ris & ISP2X_AFM_SUM_OF)
--
Gitblit v1.6.2