From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Jacopo Mondi <jacopo.mondi@ideasonboard.com>,
Linux Media Mailing List <linux-media@vger.kernel.org>,
Sakari Ailus <sakari.ailus@iki.fi>,
Stefan Klug <stefan.klug@ideasonboard.com>,
Paul Elder <paul.elder@ideasonboard.com>,
Daniel Scally <dan.scally@ideasonboard.com>,
Kieran Bingham <kieran.bingham@ideasonboard.com>,
Umang Jain <umang.jain@ideasonboard.com>,
Dafna Hirschfeld <dafna@fastmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Heiko Stuebner <heiko@sntech.de>
Subject: Re: [PATCH v7 01/12] media: uapi: rkisp1-config: Add extensible params format
Date: Tue, 30 Jul 2024 15:19:48 +0300 [thread overview]
Message-ID: <20240730121948.GN300@pendragon.ideasonboard.com> (raw)
In-Reply-To: <5b4c1957-8ba8-4409-96c5-3ae0b48f489e@xs4all.nl>
On Tue, Jul 30, 2024 at 02:14:08PM +0200, Hans Verkuil wrote:
> On 30/07/2024 14:11, Hans Verkuil wrote:
> > On 24/07/2024 10:49, Jacopo Mondi wrote:
> >> Add to the rkisp1-config.h header data types and documentation of
> >> the extensible parameters format.
> >>
> >> Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> >> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
> >> ---
> >> include/uapi/linux/rkisp1-config.h | 489 +++++++++++++++++++++++++++++
> >> 1 file changed, 489 insertions(+)
> >>
> >> diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h
> >> index 6eeaf8bf2362..00b09c92cca7 100644
> >> --- a/include/uapi/linux/rkisp1-config.h
> >> +++ b/include/uapi/linux/rkisp1-config.h
> >> @@ -996,4 +996,493 @@ struct rkisp1_stat_buffer {
> >> struct rkisp1_cif_isp_stat params;
> >> };
> >>
> >> +/*---------- PART3: Extensible Configuration Parameters ------------*/
> >> +
> >> +/**
> >> + * enum rkisp1_ext_params_block_type - RkISP1 extensible params block type
> >> + *
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_BLS: Black level subtraction
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_DPCC: Defect pixel cluster correction
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_SDG: Sensor de-gamma
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_AWB_GAIN: Auto white balance gains
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_FLT: ISP filtering
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_BDM: Bayer de-mosaic
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_CTK: Cross-talk correction
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_GOC: Gamma out correction
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_DPF: De-noise pre-filter
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_DPF_STRENGTH: De-noise pre-filter strength
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_CPROC: Color processing
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_IE: Image effects
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_LSC: Lens shading correction
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_AWB_MEAS: Auto white balance statistics
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_HST_MEAS: Histogram statistics
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_AEC_MEAS: Auto exposure statistics
> >> + * @RKISP1_EXT_PARAMS_BLOCK_TYPE_AFC_MEAS: Auto-focus statistics
> >> + */
> >> +enum rkisp1_ext_params_block_type {
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_BLS,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_DPCC,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_SDG,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_AWB_GAIN,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_FLT,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_BDM,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_CTK,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_GOC,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_DPF,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_DPF_STRENGTH,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_CPROC,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_IE,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_LSC,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_AWB_MEAS,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_HST_MEAS,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_AEC_MEAS,
> >> + RKISP1_EXT_PARAMS_BLOCK_TYPE_AFC_MEAS,
> >> +};
> >> +
> >> +/**
> >> + * enum rkisp1_ext_params_block_enable - RkISP1 extensible parameter block
> >> + * enable flags
> >> + *
> >> + * @RKISP1_EXT_PARAMS_BLOCK_DISABLE: Disable the HW block
> >> + * @RKISP1_EXT_PARAMS_BLOCK_ENABLE: Enable the HW block
> >> + */
> >> +enum rkisp1_ext_params_block_enable {
> >> + RKISP1_EXT_PARAMS_BLOCK_DISABLE,
> >> + RKISP1_EXT_PARAMS_BLOCK_ENABLE,
> >> +};
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_block_header - RkISP1 extensible parameter block
> >> + * header
> >> + *
> >> + * This structure represents the common part of all the ISP configuration
> >> + * blocks. Each parameters block shall embed an instance of this structure type
> >> + * as its first member, followed by the block-specific configuration data. The
> >> + * driver inspects this common header to discern the block type and its size and
> >> + * properly handle the block content by casting it to the correct block-specific
> >> + * type.
> >> + *
> >> + * The @type field is one of the values enumerated by
> >> + * :c:type:`rkisp1_ext_params_block_type` and specifies how the data should be
> >> + * interpreted by the driver. The @size field specifies the size of the
> >> + * parameters block and is used by the driver for validation purposes.
> >> + *
> >> + * The @enable field specifies the ISP block enablement state. The possible
> >> + * enablement states are enumerated by :c:type:`rkisp1_ext_params_block_enable`.
> >> + * When userspace needs to configure and enable an ISP block it shall fully
> >> + * populate the block configuration and the @enable flag shall be set to
> >> + * RKISP1_EXT_PARAMS_BLOCK_ENABLE. When userspace simply wants to disable the
> >> + * ISP block the @enable flag shall be set to RKISP1_EXT_PARAMS_BLOCK_DISABLE.
> >> + * The driver ignores the rest of the block configuration structure in this
> >> + * case.
> >> + *
> >> + * If a new configuration of an ISP block has to be applied userspace shall
> >> + * fully populate the ISP block configuration and set the @enable flag to
> >> + * RKISP1_EXT_PARAMS_BLOCK_ENABLE.
> >> + *
> >> + * Userspace is responsible for correctly populating the parameters block header
> >> + * fields (@type, @enable and @size) and the block-specific parameters.
> >> + *
> >> + * For example:
> >> + *
> >> + * .. code-block:: c
> >> + *
> >> + * void populate_bls(struct rkisp1_ext_params_block_header *block) {
> >> + * struct rkisp1_ext_params_bls_config *bls =
> >> + * (struct rkisp1_ext_params_bls_config *)block;
> >> + *
> >> + * bls->header.type = RKISP1_EXT_PARAMS_BLOCK_ID_BLS;
> >> + * bls->header.enable = RKISP1_EXT_PARAMS_BLOCK_ENABLE;
> >> + * bls->header.size = sizeof(*bls);
> >> + *
> >> + * bls->config.enable_auto = 0;
> >> + * bls->config.fixed_val.r = blackLevelRed_;
> >> + * bls->config.fixed_val.gr = blackLevelGreenR_;
> >> + * bls->config.fixed_val.gb = blackLevelGreenB_;
> >> + * bls->config.fixed_val.b = blackLevelBlue_;
> >> + * }
> >> + *
> >> + * @type: The parameters block type, see
> >> + * :c:type:`rkisp1_ext_params_block_type`
> >> + * @enable: The block enable flag, see
> >> + * :c:type:`rkisp1_ext_params_block_enable`
> >> + * @size: Size (in bytes) of the parameters block, including this header
> >> + */
> >> +struct rkisp1_ext_params_block_header {
> >> + __u16 type;
> >> + __u16 enable;
> >> + __u16 size;
> >
> > I would suggest changing this to '__u32 size;'. It ensures the header is8 bytes
> > long (much nicer than 6), and if there is ever a block > 65535, then it is supported.
> >
> > i wonder if, with this change, the 'aligned(8)' attributes are even needed, but
> > I didn't dig into that.
>
> Follow-up: I wonder if this can be a generic v4l2 struct: perhaps the same approach
> makes sense for other drivers as well.
>
> Just an idea.
Probably, but I'd wait until we have a couple of drivers using the same
design before standardizing something.
> > Did you check with pahole for holes etc. in the datastructures?
> >
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_bls_config - RkISP1 extensible params BLS config
> >> + *
> >> + * RkISP1 extensible parameters Black Level Subtraction configuration block.
> >> + * Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_BLS`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Black Level Subtraction configuration, see
> >> + * :c:type:`rkisp1_cif_isp_bls_config`
> >> + */
> >> +struct rkisp1_ext_params_bls_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_bls_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_dpcc_config - RkISP1 extensible params DPCC config
> >> + *
> >> + * RkISP1 extensible parameters Defective Pixel Cluster Correction configuration
> >> + * block. Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_DPCC`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Defective Pixel Cluster Correction configuration, see
> >> + * :c:type:`rkisp1_cif_isp_dpcc_config`
> >> + */
> >> +struct rkisp1_ext_params_dpcc_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_dpcc_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_sdg_config - RkISP1 extensible params SDG config
> >> + *
> >> + * RkISP1 extensible parameters Sensor Degamma configuration block. Identified
> >> + * by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_SDG`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Sensor Degamma configuration, see
> >> + * :c:type:`rkisp1_cif_isp_sdg_config`
> >> + */
> >> +struct rkisp1_ext_params_sdg_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_sdg_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_lsc_config - RkISP1 extensible params LSC config
> >> + *
> >> + * RkISP1 extensible parameters Lens Shading Correction configuration block.
> >> + * Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_LSC`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Lens Shading Correction configuration, see
> >> + * :c:type:`rkisp1_cif_isp_lsc_config`
> >> + */
> >> +struct rkisp1_ext_params_lsc_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_lsc_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_awb_gain_config - RkISP1 extensible params AWB
> >> + * gain config
> >> + *
> >> + * RkISP1 extensible parameters Auto-White Balance Gains configuration block.
> >> + * Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_AWB_GAIN`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Auto-White Balance Gains configuration, see
> >> + * :c:type:`rkisp1_cif_isp_awb_gain_config`
> >> + */
> >> +struct rkisp1_ext_params_awb_gain_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_awb_gain_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_flt_config - RkISP1 extensible params FLT config
> >> + *
> >> + * RkISP1 extensible parameters Filter configuration block. Identified by
> >> + * :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_FLT`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Filter configuration, see :c:type:`rkisp1_cif_isp_flt_config`
> >> + */
> >> +struct rkisp1_ext_params_flt_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_flt_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_bdm_config - RkISP1 extensible params BDM config
> >> + *
> >> + * RkISP1 extensible parameters Demosaicing configuration block. Identified by
> >> + * :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_BDM`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Demosaicing configuration, see :c:type:`rkisp1_cif_isp_bdm_config`
> >> + */
> >> +struct rkisp1_ext_params_bdm_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_bdm_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_ctk_config - RkISP1 extensible params CTK config
> >> + *
> >> + * RkISP1 extensible parameters Cross-Talk configuration block. Identified by
> >> + * :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_CTK`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Cross-Talk configuration, see :c:type:`rkisp1_cif_isp_ctk_config`
> >> + */
> >> +struct rkisp1_ext_params_ctk_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_ctk_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_goc_config - RkISP1 extensible params GOC config
> >> + *
> >> + * RkISP1 extensible parameters Gamma-Out configuration block. Identified by
> >> + * :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_GOC`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Gamma-Out configuration, see :c:type:`rkisp1_cif_isp_goc_config`
> >> + */
> >> +struct rkisp1_ext_params_goc_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_goc_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_dpf_config - RkISP1 extensible params DPF config
> >> + *
> >> + * RkISP1 extensible parameters De-noise Pre-Filter configuration block.
> >> + * Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_DPF`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: De-noise Pre-Filter configuration, see
> >> + * :c:type:`rkisp1_cif_isp_dpf_config`
> >> + */
> >> +struct rkisp1_ext_params_dpf_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_dpf_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_dpf_strength_config - RkISP1 extensible params DPF
> >> + * strength config
> >> + *
> >> + * RkISP1 extensible parameters De-noise Pre-Filter strength configuration
> >> + * block. Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_DPF_STRENGTH`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: De-noise Pre-Filter strength configuration, see
> >> + * :c:type:`rkisp1_cif_isp_dpf_strength_config`
> >> + */
> >> +struct rkisp1_ext_params_dpf_strength_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_dpf_strength_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_cproc_config - RkISP1 extensible params CPROC config
> >> + *
> >> + * RkISP1 extensible parameters Color Processing configuration block.
> >> + * Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_CPROC`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Color processing configuration, see
> >> + * :c:type:`rkisp1_cif_isp_cproc_config`
> >> + */
> >> +struct rkisp1_ext_params_cproc_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_cproc_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_ie_config - RkISP1 extensible params IE config
> >> + *
> >> + * RkISP1 extensible parameters Image Effect configuration block. Identified by
> >> + * :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_IE`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Image Effect configuration, see :c:type:`rkisp1_cif_isp_ie_config`
> >> + */
> >> +struct rkisp1_ext_params_ie_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_ie_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_awb_meas_config - RkISP1 extensible params AWB
> >> + * Meas config
> >> + *
> >> + * RkISP1 extensible parameters Auto-White Balance Measurement configuration
> >> + * block. Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_AWB_MEAS`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Auto-White Balance measure configuration, see
> >> + * :c:type:`rkisp1_cif_isp_awb_meas_config`
> >> + */
> >> +struct rkisp1_ext_params_awb_meas_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_awb_meas_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_hst_config - RkISP1 extensible params Histogram config
> >> + *
> >> + * RkISP1 extensible parameters Histogram statistics configuration block.
> >> + * Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_HST_MEAS`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Histogram statistics configuration, see
> >> + * :c:type:`rkisp1_cif_isp_hst_config`
> >> + */
> >> +struct rkisp1_ext_params_hst_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_hst_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_aec_config - RkISP1 extensible params AEC config
> >> + *
> >> + * RkISP1 extensible parameters Auto-Exposure statistics configuration block.
> >> + * Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_AEC_MEAS`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Auto-Exposure statistics configuration, see
> >> + * :c:type:`rkisp1_cif_isp_aec_config`
> >> + */
> >> +struct rkisp1_ext_params_aec_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_aec_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_afc_config - RkISP1 extensible params AFC config
> >> + *
> >> + * RkISP1 extensible parameters Auto-Focus statistics configuration block.
> >> + * Identified by :c:type:`RKISP1_EXT_PARAMS_BLOCK_TYPE_AFC_MEAS`.
> >> + *
> >> + * @header: The RkISP1 extensible parameters header, see
> >> + * :c:type:`rkisp1_ext_params_block_header`
> >> + * @config: Auto-Focus statistics configuration, see
> >> + * :c:type:`rkisp1_cif_isp_afc_config`
> >> + */
> >> +struct rkisp1_ext_params_afc_config {
> >> + struct rkisp1_ext_params_block_header header;
> >> + struct rkisp1_cif_isp_afc_config config;
> >> +} __attribute__((aligned(8)));
> >> +
> >> +#define RKISP1_EXT_PARAMS_MAX_SIZE \
> >> + (sizeof(struct rkisp1_ext_params_bls_config) +\
> >> + sizeof(struct rkisp1_ext_params_dpcc_config) +\
> >> + sizeof(struct rkisp1_ext_params_sdg_config) +\
> >> + sizeof(struct rkisp1_ext_params_lsc_config) +\
> >> + sizeof(struct rkisp1_ext_params_awb_gain_config) +\
> >> + sizeof(struct rkisp1_ext_params_flt_config) +\
> >> + sizeof(struct rkisp1_ext_params_bdm_config) +\
> >> + sizeof(struct rkisp1_ext_params_ctk_config) +\
> >> + sizeof(struct rkisp1_ext_params_goc_config) +\
> >> + sizeof(struct rkisp1_ext_params_dpf_config) +\
> >> + sizeof(struct rkisp1_ext_params_dpf_strength_config) +\
> >> + sizeof(struct rkisp1_ext_params_cproc_config) +\
> >> + sizeof(struct rkisp1_ext_params_ie_config) +\
> >> + sizeof(struct rkisp1_ext_params_awb_meas_config) +\
> >> + sizeof(struct rkisp1_ext_params_hst_config) +\
> >> + sizeof(struct rkisp1_ext_params_aec_config) +\
> >> + sizeof(struct rkisp1_ext_params_afc_config))
> >> +
> >> +/**
> >> + * enum rksip1_ext_param_buffer_version - RkISP1 extensible parameters version
> >> + *
> >> + * @RKISP1_EXT_PARAM_BUFFER_V1: First version of RkISP1 extensible parameters
> >> + */
> >> +enum rksip1_ext_param_buffer_version {
> >> + RKISP1_EXT_PARAM_BUFFER_V1 = 1,
> >> +};
> >> +
> >> +/**
> >> + * struct rkisp1_ext_params_cfg - RkISP1 extensible parameters configuration
> >> + *
> >> + * This struct contains the configuration parameters of the RkISP1 ISP
> >> + * algorithms, serialized by userspace into a data buffer. Each configuration
> >> + * parameter block is represented by a block-specific structure which contains a
> >> + * :c:type:`rkisp1_ext_params_block_header` entry as first member. Userspace
> >> + * populates the @data buffer with configuration parameters for the blocks that
> >> + * it intends to configure. As a consequence, the data buffer effective size
> >> + * changes according to the number of ISP blocks that userspace intends to
> >> + * configure and is set by userspace in the @data_size field.
> >> + *
> >> + * The parameters buffer is versioned by the @version field to allow modifying
> >> + * and extending its definition. Userspace shall populate the @version field to
> >> + * inform the driver about the version it intends to use. The driver will parse
> >> + * and handle the @data buffer according to the data layout specific to the
> >> + * indicated version and return an error if the desired version is not
> >> + * supported.
> >> + *
> >> + * For each ISP block that userspace wants to configure, a block-specific
> >> + * structure is appended to the @data buffer, one after the other without gaps
> >> + * in between nor overlaps. Userspace shall populate the @data_size field with
> >> + * the effective size, in bytes, of the @data buffer.
> >> + *
> >> + * The expected memory layout of the parameters buffer is::
> >> + *
> >> + * +-------------------- struct rkisp1_ext_params_cfg -------------------+
> >> + * | version = RKISP_EXT_PARAMS_BUFFER_V1; |
> >> + * | data_size = sizeof(struct rkisp1_ext_params_bls_config) |
> >> + * | + sizeof(struct rkisp1_ext_params_dpcc_config); |
> >> + * | +------------------------- data ---------------------------------+ |
> >> + * | | +------------- struct rkisp1_ext_params_bls_config -----------+ | |
> >> + * | | | +-------- struct rkisp1_ext_params_block_header ---------+ | | |
> >> + * | | | | type = RKISP1_EXT_PARAMS_BLOCK_TYPE_BLS; | | | |
> >> + * | | | | enable = RKISP1_EXT_PARAMS_BLOCK_ENABLE; | | | |
> >> + * | | | | size = sizeof(struct rkisp1_ext_params_bls_config); | | | |
> >> + * | | | +---------------------------------------------------------+ | | |
> >> + * | | | +---------- struct rkisp1_cif_isp_bls_config -------------+ | | |
> >> + * | | | | enable_auto = 0; | | | |
> >> + * | | | | fixed_val.r = 256; | | | |
> >> + * | | | | fixed_val.gr = 256; | | | |
> >> + * | | | | fixed_val.gb = 256; | | | |
> >> + * | | | | fixed_val.b = 256; | | | |
> >> + * | | | +---------------------------------------------------------+ | | |
> >> + * | | +------------ struct rkisp1_ext_params_dpcc_config -----------+ | |
> >> + * | | | +-------- struct rkisp1_ext_params_block_header ---------+ | | |
> >> + * | | | | type = RKISP1_EXT_PARAMS_BLOCK_TYPE_DPCC; | | | |
> >> + * | | | | enable = RKISP1_EXT_PARAMS_BLOCK_ENABLE; | | | |
> >> + * | | | | size = sizeof(struct rkisp1_ext_params_dpcc_config); | | | |
> >> + * | | | +---------------------------------------------------------+ | | |
> >> + * | | | +---------- struct rkisp1_cif_isp_dpcc_config ------------+ | | |
> >> + * | | | | mode = RKISP1_CIF_ISP_DPCC_MODE_STAGE1_ENABLE; | | | |
> >> + * | | | | output_mode = | | | |
> >> + * | | | | RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_G_CENTER; | | | |
> >> + * | | | | set_use = ... ; | | | |
> >> + * | | | | ... = ... ; | | | |
> >> + * | | | +---------------------------------------------------------+ | | |
> >> + * | | +-------------------------------------------------------------+ | |
> >> + * | +-----------------------------------------------------------------+ |
> >> + * +---------------------------------------------------------------------+
> >> + *
> >> + * @version: The RkISP1 extensible parameters buffer version, see
> >> + * :c:type:`rksip1_ext_param_buffer_version`
> >> + * @data_size: The RkISP1 configuration data effective size, excluding this
> >> + * header
> >> + * @data: The RkISP1 extensible configuration data blocks
> >> + */
> >> +struct rkisp1_ext_params_cfg {
> >> + __u32 version;
> >> + __u32 data_size;
> >> + __u8 data[RKISP1_EXT_PARAMS_MAX_SIZE];
> >> +};
> >> +
> >> #endif /* _UAPI_RKISP1_CONFIG_H */
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2024-07-30 12:20 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-24 8:49 [PATCH v7 0/12] media: rkisp1: Extensible parameters and companding Jacopo Mondi
2024-07-24 8:49 ` [PATCH v7 01/12] media: uapi: rkisp1-config: Add extensible params format Jacopo Mondi
2024-07-30 12:11 ` Hans Verkuil
2024-07-30 12:14 ` Hans Verkuil
2024-07-30 12:19 ` Laurent Pinchart [this message]
2024-07-30 12:18 ` Laurent Pinchart
2024-07-30 12:37 ` Hans Verkuil
2024-08-05 11:52 ` Sakari Ailus
2024-08-06 7:30 ` Jacopo Mondi
2024-08-06 8:52 ` Laurent Pinchart
2024-08-06 8:53 ` Sakari Ailus
2024-08-06 9:05 ` Jacopo Mondi
2024-08-06 7:27 ` Jacopo Mondi
2024-08-06 8:17 ` Hans Verkuil
2024-08-06 8:24 ` Jacopo Mondi
2024-08-06 9:06 ` Laurent Pinchart
2024-08-06 9:16 ` Jacopo Mondi
2024-08-06 9:32 ` Laurent Pinchart
2024-08-06 11:20 ` Sakari Ailus
2024-07-24 8:49 ` [PATCH v7 02/12] media: uapi: videodev2: Add V4L2_META_FMT_RK_ISP1_EXT_PARAMS Jacopo Mondi
2024-07-24 8:49 ` [PATCH v7 03/12] media: rkisp1: Add struct rkisp1_params_buffer Jacopo Mondi
2024-07-24 8:49 ` [PATCH v7 04/12] media: rkisp1: Copy the parameters buffer Jacopo Mondi
2024-07-24 8:49 ` [PATCH v7 05/12] media: rkisp1: Cache the currently active format Jacopo Mondi
2024-07-24 8:49 ` [PATCH v7 06/12] media: rkisp1: Implement extensible params support Jacopo Mondi
2024-07-24 8:49 ` [PATCH v7 07/12] media: rkisp1: Implement s_fmt/try_fmt Jacopo Mondi
2024-07-24 8:49 ` [PATCH v7 08/12] media: rkisp1: Add helper function to swap colour channels Jacopo Mondi
2024-07-24 8:50 ` [PATCH v7 09/12] media: rkisp1: Add features mask to extensible block handlers Jacopo Mondi
2024-07-24 8:50 ` [PATCH v7 10/12] media: rkisp1: Add register definitions for the companding block Jacopo Mondi
2024-07-24 8:50 ` [PATCH v7 11/12] media: rkisp1: Add feature flags for BLS and compand Jacopo Mondi
2024-07-24 8:50 ` [PATCH v7 12/12] media: rkisp1: Add support for the companding block Jacopo Mondi
2024-07-24 10:44 ` [PATCH v7 0/12] media: rkisp1: Extensible parameters and companding Kieran Bingham
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=20240730121948.GN300@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dafna@fastmail.com \
--cc=dan.scally@ideasonboard.com \
--cc=heiko@sntech.de \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jacopo.mondi@ideasonboard.com \
--cc=kieran.bingham@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=paul.elder@ideasonboard.com \
--cc=sakari.ailus@iki.fi \
--cc=stefan.klug@ideasonboard.com \
--cc=umang.jain@ideasonboard.com \
/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