Hi Dan,
Thank you for the patch.
On Wed, May 29, 2024 at 04:28:58PM +0100, Daniel Scally wrote:
> Document the mali-c55 parameter setting by expanding the relevant
> pages in both admin-guide/ and userspace-api/.
>
> Acked-by: Nayden Kanchev <nayden.kanchev@xxxxxxx>
> Co-developed-by: Jacopo Mondi <jacopo.mondi@xxxxxxxxxxxxxxxx>
> Signed-off-by: Jacopo Mondi <jacopo.mondi@xxxxxxxxxxxxxxxx>
> Signed-off-by: Daniel Scally <dan.scally@xxxxxxxxxxxxxxxx>
> ---
> Changes in v5:
>
> - New patch
>
> Documentation/admin-guide/media/mali-c55.rst | 19 +++++-
> .../media/v4l/metafmt-arm-mali-c55.rst | 65 ++++++++++++++++++-
> 2 files changed, 79 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/admin-guide/media/mali-c55.rst b/Documentation/admin-guide/media/mali-c55.rst
> index b75437f6e96a..c5e6ac826c99 100644
> --- a/Documentation/admin-guide/media/mali-c55.rst
> +++ b/Documentation/admin-guide/media/mali-c55.rst
> @@ -380,9 +380,24 @@ the processing flow the statistics can be drawn from::
> +-------------+ | +-------------+
> +--> AWB-1
>
> -At present all statistics are drawn from the 0th tap point for each algorithm;
> +By default all statistics are drawn from the 0th tap point for each algorithm;
> I.E. AEXP statistics from AEXP-0 (A), AWB statistics from AWB-0 and AF
> -statistics from AF-0. In the future this will be configurable.
> +statistics from AF-0. This is configurable for AEXP and AWB statsistics through
> +programming the ISP's parameters.
> +
> +.. _mali-c55-3a-params:
> +
> +Programming ISP Parameters
> +==========================
> +
> +The ISP can be programmed with various parameters from userspace to apply to the
> +hardware before and during video stream. This allows userspace to dynamically
> +change values such as black level, white balance and lens shading gains and so
> +on.
> +
> +The buffer format and how to populate it are described by the
> +:ref:`V4L2_META_FMT_MALI_C55_PARAMS <v4l2-meta-fmt-mali-c55-params>` format,
> +which should be set as the data format for the `mali-c55 3a params` video node.
>
> References
> ==========
> diff --git a/Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst b/Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst
> index 219a5dd42d70..c359d2c83858 100644
> --- a/Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst
> +++ b/Documentation/userspace-api/media/v4l/metafmt-arm-mali-c55.rst
> @@ -1,10 +1,11 @@
> .. SPDX-License-Identifier: GPL-2.0
>
> +.. _v4l2-meta-fmt-mali-c55-params:
> .. _v4l2-meta-fmt-mali-c55-3a-stats:
>
> -****************************************
> -V4L2_META_FMT_MALI_C55_3A_STATS ('C55S')
> -****************************************
> +********************************************************************************
> +V4L2_META_FMT_MALI_C55_3A_STATS ('C55S'), V4L2_META_FMT_MALI_C55_PARAMS ('C55P')
> +********************************************************************************
>
> 3A Statistics
> =============
> @@ -22,6 +23,64 @@ of the C structure :c:type:`mali_c55_stats_buffer` defined in
>
> For details of the statistics see :c:type:`mali_c55_stats_buffer`.
>
> +Configuration Parameters
> +========================
> +
> +The configuration parameters are passed to the
> +:ref:`mali-c55 3a params <mali-c55-3a-params>` metadata output video node, using
> +the :c:type:`v4l2_meta_format` interface. Rather than a single struct containing
> +sub-structs for each configurable area of the ISP, parameters for the Mali-C55
> +are defined as distinct structs or "blocks" which may be added to the data
> +member of struct mali_c55_params_buffer. Userspace is responsible for populating
> +the data member with the blocks that need to be configured by the driver, but
> +need not populate it with **all** the blocks, or indeed with any at all if there
> +are no configuration changes to make. Populated blocks **must** be consecutive
> +in the buffer. To assist both userspace and the driver in identifying the
> +blocks each block-specific struct should embed
s/should embed/embeds/
> +struct mali_c55_params_block_header as its first member and userspace must
> +populate the type member with a value from enum mali_c55_param_block_type. Once
It would be nice to add references to the struct and enum.
> +the blocks have been populated into the data buffer, the combined size of all
> +populated blocks should be set in the total_size member of
s/should be/is/
or "must" or "shall".
> +struct mali_c55_params_buffer. For example:
> +
> +.. code-block:: c
> +
> + struct mali_c55_params_buffer *params =
> + (struct mali_c55_params_buffer *)buffer;
> +
> + params->version = MALI_C55_PARAM_BUFFER_V0;
I think applications will likely handle the size as follows:
params->total_size = 0;
> +
> + void *data = (void *)params->data;
> +
> + struct mali_c55_params_awb_gains *gains =
> + (struct mali_c55_params_awb_gains *)data;
> +
> + gains->header.type = MALI_C55_PARAM_BLOCK_AWB_GAINS;
> + gains->header.enabled = true;
> + gains->header.size = sizeof(struct mali_c55_params_awb_gains);
> +
> + gains->gain00 = 256;
> + gains->gain00 = 256;
> + gains->gain00 = 256;
> + gains->gain00 = 256;
> +
> + data += sizeof(struct mali_c55_params_awb_gains)
params->total_size += sizeof(struct mali_c55_params_awb_gains);
> +
> + struct mali_c55_params_sensor_off_preshading *blc =
> + (struct mali_c55_params_sensor_off_preshading *)data;
> +
> + blc->header.type = MALI_C55_PARAM_BLOCK_SENSOR_OFFS;
> + blc->header.enabled = true;
> + blc->header.size = sizeof(struct mali_c55_params_sensor_off_preshading);
> +
> + blc->chan00 = 51200;
> + blc->chan01 = 51200;
> + blc->chan10 = 51200;
> + blc->chan11 = 51200;
> +
> + params->total_size = sizeof(struct mali_c55_params_awb_gains) +
> + sizeof(struct mali_c55_params_sensor_off_preshading);
params->total_size += sizeof(struct mali_c55_params_sensor_off_preshading);
I could be wrong though. Up to you.
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> +
> Arm Mali-C55 uAPI data types
> ============================
>
--
Regards,
Laurent Pinchart
