From: Heiko Stuebner <heiko@sntech.de>
To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl
Cc: ezequiel@collabora.com, dafna.hirschfeld@collabora.com,
helen.koike@collabora.com, Laurent.pinchart@ideasonboard.com,
linux-rockchip@lists.infradead.org, linux-media@vger.kernel.org,
heiko@sntech.de, robh+dt@kernel.org, devicetree@vger.kernel.org,
Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
Subject: [PATCH v6 06/10] media: rockchip: rkisp1: make some isp-stats functions variable
Date: Fri, 18 Jun 2021 15:02:34 +0200 [thread overview]
Message-ID: <20210618130238.4171196-7-heiko@sntech.de> (raw)
In-Reply-To: <20210618130238.4171196-1-heiko@sntech.de>
From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
The isp block evolved in subsequent socs, so some functions
will behave differently on newer variants.
Therefore make it possible to override the needed stats functions.
Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
---
.../media/platform/rockchip/rkisp1/rkisp1-common.h | 11 +++++++++++
.../media/platform/rockchip/rkisp1/rkisp1-stats.c | 14 +++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 74ddd8256366..d7f93547fab6 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -236,6 +236,16 @@ struct rkisp1_capture {
} pix;
};
+struct rkisp1_stats;
+struct rkisp1_stats_ops {
+ void (*get_awb_meas)(struct rkisp1_stats *stats,
+ struct rkisp1_stat_buffer *pbuf);
+ void (*get_aec_meas)(struct rkisp1_stats *stats,
+ struct rkisp1_stat_buffer *pbuf);
+ void (*get_hst_meas)(struct rkisp1_stats *stats,
+ struct rkisp1_stat_buffer *pbuf);
+};
+
/*
* struct rkisp1_stats - ISP Statistics device
*
@@ -248,6 +258,7 @@ struct rkisp1_capture {
struct rkisp1_stats {
struct rkisp1_vdev_node vnode;
struct rkisp1_device *rkisp1;
+ struct rkisp1_stats_ops *ops;
spinlock_t lock; /* locks the buffers list 'stats' */
struct list_head stat;
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
index c1d07a2e8839..f68a5e78e54a 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c
@@ -287,6 +287,12 @@ static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats,
}
}
+static struct rkisp1_stats_ops rkisp1_stats_ops = {
+ .get_awb_meas = rkisp1_stats_get_awb_meas,
+ .get_aec_meas = rkisp1_stats_get_aec_meas,
+ .get_hst_meas = rkisp1_stats_get_hst_meas,
+};
+
static void
rkisp1_stats_send_measurement(struct rkisp1_stats *stats, u32 isp_ris)
{
@@ -309,18 +315,18 @@ rkisp1_stats_send_measurement(struct rkisp1_stats *stats, u32 isp_ris)
(struct rkisp1_stat_buffer *)(cur_buf->vaddr);
if (isp_ris & RKISP1_CIF_ISP_AWB_DONE)
- rkisp1_stats_get_awb_meas(stats, cur_stat_buf);
+ stats->ops->get_awb_meas(stats, cur_stat_buf);
if (isp_ris & RKISP1_CIF_ISP_AFM_FIN)
rkisp1_stats_get_afc_meas(stats, cur_stat_buf);
if (isp_ris & RKISP1_CIF_ISP_EXP_END) {
- rkisp1_stats_get_aec_meas(stats, cur_stat_buf);
+ stats->ops->get_aec_meas(stats, cur_stat_buf);
rkisp1_stats_get_bls_meas(stats, cur_stat_buf);
}
if (isp_ris & RKISP1_CIF_ISP_HIST_MEASURE_RDY)
- rkisp1_stats_get_hst_meas(stats, cur_stat_buf);
+ stats->ops->get_hst_meas(stats, cur_stat_buf);
vb2_set_plane_payload(&cur_buf->vb.vb2_buf, 0,
sizeof(struct rkisp1_stat_buffer));
@@ -354,6 +360,8 @@ static void rkisp1_init_stats(struct rkisp1_stats *stats)
V4L2_META_FMT_RK_ISP1_STAT_3A;
stats->vdev_fmt.fmt.meta.buffersize =
sizeof(struct rkisp1_stat_buffer);
+
+ stats->ops = &rkisp1_stats_ops;
}
int rkisp1_stats_register(struct rkisp1_device *rkisp1)
--
2.29.2
next prev parent reply other threads:[~2021-06-18 13:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 13:02 [PATCH v6 0/7] rkisp1 support for px30 Heiko Stuebner
2021-06-18 13:02 ` [PATCH v6 01/10] media: rockchip: rkisp1: remove unused irq variable Heiko Stuebner
2021-06-18 13:02 ` [PATCH v6 02/10] dt-bindings: media: rkisp1: fix pclk clock-name Heiko Stuebner
2021-07-12 20:04 ` Rob Herring
2021-06-18 13:02 ` [PATCH v6 03/10] dt-bindings: media: rkisp1: document different irq possibilities Heiko Stuebner
2021-07-12 20:05 ` Rob Herring
2021-06-18 13:02 ` [PATCH v6 04/10] media: rockchip: rkisp1: allow separate interrupts Heiko Stuebner
2021-06-18 13:02 ` [PATCH v6 05/10] media: rockchip: rkisp1: make some isp-param functions variable Heiko Stuebner
2021-06-20 7:21 ` Dafna Hirschfeld
2021-07-12 20:43 ` Laurent Pinchart
2021-06-18 13:02 ` Heiko Stuebner [this message]
2021-06-20 7:22 ` [PATCH v6 06/10] media: rockchip: rkisp1: make some isp-stats " Dafna Hirschfeld
2021-07-12 20:44 ` Laurent Pinchart
2021-06-18 13:02 ` [PATCH v6 07/10] media: rockchip: rkisp1: add prefixes for v10 specific parts Heiko Stuebner
2021-06-18 13:02 ` [PATCH v6 08/10] media: rockchip: rkisp1: add support for v12 isp variants Heiko Stuebner
2021-06-20 7:26 ` Dafna Hirschfeld
2021-07-12 20:47 ` Laurent Pinchart
2021-06-18 13:02 ` [PATCH v6 09/10] dt-bindings: media: rkisp1: document px30 isp compatible Heiko Stuebner
2021-07-12 20:06 ` Rob Herring
2021-06-18 13:02 ` [PATCH v6 10/10] media: rockchip: rkisp1: add support for px30 isp version Heiko Stuebner
2021-07-12 20:40 ` [PATCH v6 0/7] rkisp1 support for px30 Laurent Pinchart
2021-07-12 20:46 ` Heiko Stübner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210618130238.4171196-7-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=dafna.hirschfeld@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=ezequiel@collabora.com \
--cc=heiko.stuebner@theobroma-systems.com \
--cc=helen.koike@collabora.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).