| Message ID | 20210618130238.4171196-7-heiko@sntech.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | rkisp1 support for px30 | expand |
On 18.06.21 16:02, Heiko Stuebner wrote: > 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> Reviewed-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.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) >
Hi Heiko, Thank you for the patch. On Fri, Jun 18, 2021 at 03:02:34PM +0200, Heiko Stuebner wrote: > 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; This should be const. > > 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 = { And this should be const too. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + .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)
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)