From: Heiko Stuebner <heiko@sntech.de> To: ezequiel@collabora.com, dafna.hirschfeld@collabora.com, helen.koike@collabora.com, Laurent.pinchart@ideasonboard.com Cc: linux-rockchip@lists.infradead.org, christoph.muellner@theobroma-systems.com, linux-media@vger.kernel.org, mchehab@kernel.org, heiko@sntech.de, Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Subject: [PATCH RFC 09/11] media: rockchip: rkisp1: make some isp-stats functions variable Date: Fri, 8 Jan 2021 20:33:09 +0100 [thread overview] Message-ID: <20210108193311.3423236-10-heiko@sntech.de> (raw) In-Reply-To: <20210108193311.3423236-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> --- .../platform/rockchip/rkisp1/rkisp1-common.h | 17 +++++++++++++ .../platform/rockchip/rkisp1/rkisp1-stats.c | 24 +++++++++++++++---- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h index 4034a05ef9d2..be0ae02165c9 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h @@ -240,6 +240,21 @@ 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_config { + const int ae_mean_max; + const int hist_bin_n_max; +}; + /* * struct rkisp1_stats - ISP Statistics device * @@ -252,6 +267,8 @@ struct rkisp1_capture { struct rkisp1_stats { struct rkisp1_vdev_node vnode; struct rkisp1_device *rkisp1; + struct rkisp1_stats_ops *ops; + struct rkisp1_stats_config *config; 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 3ddab8fa8f2d..7136292039f6 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c @@ -203,7 +203,7 @@ static void rkisp1_stats_get_aec_meas(struct rkisp1_stats *stats, unsigned int i; pbuf->meas_type |= RKISP1_CIF_ISP_STAT_AUTOEXP; - for (i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX; i++) + for (i = 0; i < stats->config->ae_mean_max; i++) pbuf->params.ae.exp_mean[i] = (u8)rkisp1_read(rkisp1, RKISP1_CIF_ISP_EXP_MEAN_00 + i * 4); @@ -233,7 +233,7 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, unsigned int i; pbuf->meas_type |= RKISP1_CIF_ISP_STAT_HIST; - for (i = 0; i < RKISP1_CIF_ISP_HIST_BIN_N_MAX; i++) + for (i = 0; i < stats->config->hist_bin_n_max; i++) pbuf->params.hist.hist_bins[i] = (u8)rkisp1_read(rkisp1, RKISP1_CIF_ISP_HIST_BIN_0 + i * 4); @@ -286,6 +286,17 @@ 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 struct rkisp1_stats_config rkisp1_stats_config = { + .ae_mean_max = 25, + .hist_bin_n_max = 16, +}; + static void rkisp1_stats_send_measurement(struct rkisp1_stats *stats, u32 isp_ris) { @@ -308,18 +319,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)); @@ -353,6 +364,9 @@ 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; + stats->config = &rkisp1_stats_config; } int rkisp1_stats_register(struct rkisp1_device *rkisp1) -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Heiko Stuebner <heiko@sntech.de> To: ezequiel@collabora.com, dafna.hirschfeld@collabora.com, helen.koike@collabora.com, Laurent.pinchart@ideasonboard.com Cc: heiko@sntech.de, Heiko Stuebner <heiko.stuebner@theobroma-systems.com>, linux-rockchip@lists.infradead.org, christoph.muellner@theobroma-systems.com, mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH RFC 09/11] media: rockchip: rkisp1: make some isp-stats functions variable Date: Fri, 8 Jan 2021 20:33:09 +0100 [thread overview] Message-ID: <20210108193311.3423236-10-heiko@sntech.de> (raw) In-Reply-To: <20210108193311.3423236-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> --- .../platform/rockchip/rkisp1/rkisp1-common.h | 17 +++++++++++++ .../platform/rockchip/rkisp1/rkisp1-stats.c | 24 +++++++++++++++---- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h index 4034a05ef9d2..be0ae02165c9 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h @@ -240,6 +240,21 @@ 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_config { + const int ae_mean_max; + const int hist_bin_n_max; +}; + /* * struct rkisp1_stats - ISP Statistics device * @@ -252,6 +267,8 @@ struct rkisp1_capture { struct rkisp1_stats { struct rkisp1_vdev_node vnode; struct rkisp1_device *rkisp1; + struct rkisp1_stats_ops *ops; + struct rkisp1_stats_config *config; 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 3ddab8fa8f2d..7136292039f6 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c @@ -203,7 +203,7 @@ static void rkisp1_stats_get_aec_meas(struct rkisp1_stats *stats, unsigned int i; pbuf->meas_type |= RKISP1_CIF_ISP_STAT_AUTOEXP; - for (i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX; i++) + for (i = 0; i < stats->config->ae_mean_max; i++) pbuf->params.ae.exp_mean[i] = (u8)rkisp1_read(rkisp1, RKISP1_CIF_ISP_EXP_MEAN_00 + i * 4); @@ -233,7 +233,7 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, unsigned int i; pbuf->meas_type |= RKISP1_CIF_ISP_STAT_HIST; - for (i = 0; i < RKISP1_CIF_ISP_HIST_BIN_N_MAX; i++) + for (i = 0; i < stats->config->hist_bin_n_max; i++) pbuf->params.hist.hist_bins[i] = (u8)rkisp1_read(rkisp1, RKISP1_CIF_ISP_HIST_BIN_0 + i * 4); @@ -286,6 +286,17 @@ 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 struct rkisp1_stats_config rkisp1_stats_config = { + .ae_mean_max = 25, + .hist_bin_n_max = 16, +}; + static void rkisp1_stats_send_measurement(struct rkisp1_stats *stats, u32 isp_ris) { @@ -308,18 +319,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)); @@ -353,6 +364,9 @@ 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; + stats->config = &rkisp1_stats_config; } int rkisp1_stats_register(struct rkisp1_device *rkisp1) -- 2.29.2 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2021-01-08 19:34 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-08 19:33 [RFC PATCH 00/11] rkisp1 support for px30 - including uapi questions for 5.11 Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-08 19:33 ` [PATCH RFC 01/11] arm64: dts: rockchip: add csi-dphy to px30 Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-08 19:33 ` [PATCH RFC 02/11] arm64: dts: rockchip: add isp node for px30 Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-08 19:33 ` [PATCH RFC 03/11] arm64: dts: rockchip: hook up camera on px30-evb Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-08 19:33 ` [PATCH RFC 04/11] phy/rockchip: add Innosilicon-based CSI dphy Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-18 18:05 ` Helen Koike 2021-01-18 18:05 ` Helen Koike 2021-01-08 19:33 ` [PATCH RFC 05/11] media: rockchip: rkisp1: extend uapi array sizes Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-09 20:12 ` Dafna Hirschfeld 2021-01-09 20:12 ` Dafna Hirschfeld 2021-01-08 19:33 ` [PATCH RFC 06/11] media: rockchip: rkisp1: allow separate interrupts Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-18 18:05 ` Helen Koike 2021-01-18 18:05 ` Helen Koike 2021-02-05 13:23 ` Dafna Hirschfeld 2021-02-05 13:23 ` Dafna Hirschfeld 2021-01-08 19:33 ` [PATCH RFC 07/11] media: rockchip: rkisp1: carry ip version information Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-08 19:33 ` [PATCH RFC 08/11] media: rockchip: rkisp1: make some isp-param functions variable Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-18 18:05 ` Helen Koike 2021-01-18 18:05 ` Helen Koike 2021-02-05 14:05 ` Dafna Hirschfeld 2021-02-05 14:05 ` Dafna Hirschfeld 2021-01-08 19:33 ` Heiko Stuebner [this message] 2021-01-08 19:33 ` [PATCH RFC 09/11] media: rockchip: rkisp1: make some isp-stats " Heiko Stuebner 2021-01-18 18:05 ` Helen Koike 2021-01-18 18:05 ` Helen Koike 2021-01-08 19:33 ` [PATCH RFC 10/11] media: rockchip: rkisp1: add support for v12 isp variants Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner 2021-01-18 18:06 ` Helen Koike 2021-01-18 18:06 ` Helen Koike 2021-02-05 19:23 ` Dafna Hirschfeld 2021-02-05 19:23 ` Dafna Hirschfeld 2021-02-08 12:24 ` Helen Koike 2021-02-08 12:24 ` Helen Koike 2021-02-05 14:04 ` Dafna Hirschfeld 2021-02-05 14:04 ` Dafna Hirschfeld 2021-02-05 14:32 ` Dafna Hirschfeld 2021-02-05 14:32 ` Dafna Hirschfeld 2021-01-08 19:33 ` [PATCH RFC 11/11] media: rockchip: rkisp1: add support for px30 isp version Heiko Stuebner 2021-01-08 19:33 ` Heiko Stuebner
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=20210108193311.3423236-10-heiko@sntech.de \ --to=heiko@sntech.de \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=christoph.muellner@theobroma-systems.com \ --cc=dafna.hirschfeld@collabora.com \ --cc=ezequiel@collabora.com \ --cc=heiko.stuebner@theobroma-systems.com \ --cc=helen.koike@collabora.com \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mchehab@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.