Hi Dan,
Thank you for the patch.
On Tue, Jul 09, 2024 at 02:29:05PM +0100, Daniel Scally wrote:
> Add a new code file to the mali-c55 driver that registers an output
> video node for userspace to queue buffers of parameters to. Handlers
> are included to program the statistics generation plus the white
> balance, black level correction and mesh shading correction blocks.
>
> Update the rest of the driver to register and link the new video node
>
> 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 v6:
>
> - Used a union to generalise the block pointer rather than resorting to
> casting everywhere - fantastic idea Sakari, this made it much cleaner.
> - Reworked the loop in mali_c55_params_write_config() so that we can be
> sure there's remaining space for the next block header.
>
> Changes in v5:
>
> - New patch
>
> drivers/media/platform/arm/mali-c55/Makefile | 1 +
> .../platform/arm/mali-c55/mali-c55-common.h | 20 +
> .../platform/arm/mali-c55/mali-c55-core.c | 23 +
> .../platform/arm/mali-c55/mali-c55-isp.c | 21 +-
> .../platform/arm/mali-c55/mali-c55-params.c | 671 ++++++++++++++++++
> .../arm/mali-c55/mali-c55-registers.h | 128 ++++
> 6 files changed, 863 insertions(+), 1 deletion(-)
> create mode 100644 drivers/media/platform/arm/mali-c55/mali-c55-params.c
>
> diff --git a/drivers/media/platform/arm/mali-c55/Makefile b/drivers/media/platform/arm/mali-c55/Makefile
> index b5a22d414479..d5718b0b23e0 100644
> --- a/drivers/media/platform/arm/mali-c55/Makefile
> +++ b/drivers/media/platform/arm/mali-c55/Makefile
> @@ -3,6 +3,7 @@
> mali-c55-y := mali-c55-capture.o \
> mali-c55-core.o \
> mali-c55-isp.o \
> + mali-c55-params.o \
> mali-c55-resizer.o \
> mali-c55-stats.o \
> mali-c55-tpg.o
> diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-common.h b/drivers/media/platform/arm/mali-c55/mali-c55-common.h
> index 136c785c68ba..66a46a7c0547 100644
> --- a/drivers/media/platform/arm/mali-c55/mali-c55-common.h
> +++ b/drivers/media/platform/arm/mali-c55/mali-c55-common.h
> @@ -50,6 +50,7 @@ enum mali_c55_isp_pads {
> MALI_C55_ISP_PAD_SOURCE_VIDEO,
> MALI_C55_ISP_PAD_SOURCE_BYPASS,
> MALI_C55_ISP_PAD_SOURCE_STATS,
> + MALI_C55_ISP_PAD_SINK_PARAMS,
> MALI_C55_ISP_NUM_PADS,
> };
>
> @@ -184,6 +185,21 @@ struct mali_c55_stats {
> } buffers;
> };
>
> +struct mali_c55_params {
> + struct mali_c55 *mali_c55;
> + struct video_device vdev;
> + struct vb2_queue queue;
> + struct media_pad pad;
> + /* Mutex to provide to vb2 */
> + struct mutex lock;
> +
> + struct {
> + /* Spinlock to guard buffer queue */
> + spinlock_t lock;
> + struct list_head queue;
> + } buffers;
> +};
> +
> enum mali_c55_config_spaces {
> MALI_C55_CONFIG_PING,
> MALI_C55_CONFIG_PONG,
> @@ -226,6 +242,7 @@ struct mali_c55 {
> struct mali_c55_isp isp;
> struct mali_c55_resizer resizers[MALI_C55_NUM_RSZS];
> struct mali_c55_cap_dev cap_devs[MALI_C55_NUM_CAP_DEVS];
> + struct mali_c55_params params;
> struct mali_c55_stats stats;
>
> struct mali_c55_context context;
> @@ -256,6 +273,8 @@ int mali_c55_register_capture_devs(struct mali_c55 *mali_c55);
> void mali_c55_unregister_capture_devs(struct mali_c55 *mali_c55);
> int mali_c55_register_stats(struct mali_c55 *mali_c55);
> void mali_c55_unregister_stats(struct mali_c55 *mali_c55);
> +int mali_c55_register_params(struct mali_c55 *mali_c55);
> +void mali_c55_unregister_params(struct mali_c55 *mali_c55);
> struct mali_c55_context *mali_c55_get_active_context(struct mali_c55 *mali_c55);
> void mali_c55_set_plane_done(struct mali_c55_cap_dev *cap_dev,
> enum mali_c55_planes plane);
> @@ -272,5 +291,6 @@ const struct mali_c55_isp_fmt *
> mali_c55_isp_get_mbus_config_by_index(u32 index);
> void mali_c55_stats_fill_buffer(struct mali_c55 *mali_c55,
> enum mali_c55_config_spaces cfg_space);
> +void mali_c55_params_write_config(struct mali_c55 *mali_c55);
>
> #endif /* _MALI_C55_COMMON_H */
> diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-core.c b/drivers/media/platform/arm/mali-c55/mali-c55-core.c
> index ed0db34767a4..55b3cbf53791 100644
> --- a/drivers/media/platform/arm/mali-c55/mali-c55-core.c
> +++ b/drivers/media/platform/arm/mali-c55/mali-c55-core.c
> @@ -384,6 +384,16 @@ static int mali_c55_create_links(struct mali_c55 *mali_c55)
> goto err_remove_links;
> }
>
> + ret = media_create_pad_link(&mali_c55->params.vdev.entity, 0,
> + &mali_c55->isp.sd.entity,
> + MALI_C55_ISP_PAD_SINK_PARAMS,
> + MEDIA_LNK_FL_ENABLED);
Should this be immutable, or do you think it makes sense to support
operating the ISP without parameters ? I know we did so when developing
the driver to test the initial code, but are there real use cases now ?
> + if (ret) {
> + dev_err(mali_c55->dev,
> + "failed to link ISP and parameters video node\n");
> + goto err_remove_links;
> + }
> +
> return 0;
>
> err_remove_links:
> @@ -398,6 +408,7 @@ static void mali_c55_unregister_entities(struct mali_c55 *mali_c55)
> mali_c55_unregister_isp(mali_c55);
> mali_c55_unregister_resizers(mali_c55);
> mali_c55_unregister_capture_devs(mali_c55);
> + mali_c55_unregister_params(mali_c55);
> mali_c55_unregister_stats(mali_c55);
> }
>
> @@ -421,6 +432,10 @@ static int mali_c55_register_entities(struct mali_c55 *mali_c55)
> if (ret)
> goto err_unregister_entities;
>
> + ret = mali_c55_register_params(mali_c55);
> + if (ret)
> + goto err_unregister_entities;
> +
> ret = mali_c55_register_stats(mali_c55);
> if (ret)
> goto err_unregister_entities;
> @@ -620,6 +635,14 @@ static irqreturn_t mali_c55_isr(int irq, void *context)
> curr_config >>= ffs(MALI_C55_REG_PING_PONG_READ_MASK) - 1;
> next_config = curr_config ^ 1;
>
> + /*
> + * Write the configuration parameters received from
> + * userspace into the configuration buffer, which will
> + * be transferred to the 'next' active config space at
> + * by mali_c55_swap_next_config().
> + */
> + mali_c55_params_write_config(mali_c55);
> +
> /*
> * The ordering of these two is currently important as
> * mali_c55_stats_fill_buffer() is asynchronous whereas
> diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-isp.c b/drivers/media/platform/arm/mali-c55/mali-c55-isp.c
> index 2f450c00300a..40d7ef6eda22 100644
> --- a/drivers/media/platform/arm/mali-c55/mali-c55-isp.c
> +++ b/drivers/media/platform/arm/mali-c55/mali-c55-isp.c
> @@ -132,6 +132,7 @@ static int mali_c55_isp_start(struct mali_c55 *mali_c55)
> cfg->bypass ? MALI_C55_ISP_RAW_BYPASS_BYPASS_MASK :
> 0x00);
>
> + mali_c55_params_write_config(mali_c55);
> ret = mali_c55_config_write(ctx, MALI_C55_CONFIG_PING);
> if (ret) {
> dev_err(mali_c55->dev, "failed to write ISP config\n");
> @@ -464,12 +465,17 @@ static int mali_c55_isp_init_state(struct v4l2_subdev *sd,
>
> src_fmt = v4l2_subdev_state_get_format(state,
> MALI_C55_ISP_PAD_SOURCE_STATS);
> + sink_fmt = v4l2_subdev_state_get_format(state,
> + MALI_C55_ISP_PAD_SINK_PARAMS);
>
> src_fmt->width = sizeof(struct mali_c55_stats_buffer);
> src_fmt->height = 1;
> src_fmt->field = V4L2_FIELD_NONE;
> src_fmt->code = MEDIA_BUS_FMT_METADATA_FIXED;
>
> + *sink_fmt = *src_fmt;
I would initialize the fields individually, I think the code would be
clearer.
> + sink_fmt->width = sizeof(struct mali_c55_params_buffer);
> +
> return 0;
> }
>
> @@ -477,8 +483,20 @@ static const struct v4l2_subdev_internal_ops mali_c55_isp_internal_ops = {
> .init_state = mali_c55_isp_init_state,
> };
>
> +static int mali_c55_subdev_link_validate(struct media_link *link)
> +{
> + /*
> + * Skip validation for the parameters sink pad, as the source is not
> + * a subdevice.
> + */
> + if (link->sink->index == MALI_C55_ISP_PAD_SINK_PARAMS)
> + return 0;
> +
> + return v4l2_subdev_link_validate(link);
> +}
> +
> static const struct media_entity_operations mali_c55_isp_media_ops = {
> - .link_validate = v4l2_subdev_link_validate,
> + .link_validate = mali_c55_subdev_link_validate,
> };
>
> int mali_c55_register_isp(struct mali_c55 *mali_c55)
> @@ -501,6 +519,7 @@ int mali_c55_register_isp(struct mali_c55 *mali_c55)
> isp->pads[MALI_C55_ISP_PAD_SOURCE_VIDEO].flags = MEDIA_PAD_FL_SOURCE;
> isp->pads[MALI_C55_ISP_PAD_SOURCE_BYPASS].flags = MEDIA_PAD_FL_SOURCE;
> isp->pads[MALI_C55_ISP_PAD_SOURCE_STATS].flags = MEDIA_PAD_FL_SOURCE;
> + isp->pads[MALI_C55_ISP_PAD_SINK_PARAMS].flags = MEDIA_PAD_FL_SINK;
>
> ret = media_entity_pads_init(&sd->entity, MALI_C55_ISP_NUM_PADS,
> isp->pads);
> diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-params.c b/drivers/media/platform/arm/mali-c55/mali-c55-params.c
> new file mode 100644
> index 000000000000..c0ca4a759653
> --- /dev/null
> +++ b/drivers/media/platform/arm/mali-c55/mali-c55-params.c
> @@ -0,0 +1,671 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * ARM Mali-C55 ISP Driver - Configuration parameters output device
> + *
> + * Copyright (C) 2024 Ideas on Board Oy
> + */
> +#include <linux/media/arm/mali-c55-config.h>
> +
> +#include <media/media-entity.h>
> +#include <media/v4l2-dev.h>
> +#include <media/v4l2-event.h>
> +#include <media/v4l2-fh.h>
> +#include <media/v4l2-ioctl.h>
> +#include <media/videobuf2-core.h>
> +#include <media/videobuf2-dma-contig.h>
> +
> +#include "mali-c55-common.h"
> +#include "mali-c55-registers.h"
> +
> +typedef void (*mali_c55_block_handler)(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block);
> +
> +struct mali_c55_block_handler {
> + size_t size;
> + mali_c55_block_handler handler;
> +};
> +
> +static void mali_c55_params_sensor_offs(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block)
> +{
> + struct mali_c55_params_sensor_off_preshading *p = block.sensor_offs;
> + __u32 global_offset;
> +
> + if (!block.header->enabled)
> + return;
> +
> + if (!(p->chan00 || p->chan01 || p->chan10 || p->chan11))
> + return;
> +
> + mali_c55_ctx_write(mali_c55, MALI_C55_REG_SENSOR_OFF_PRE_SHA_00,
> + p->chan00 & MALI_C55_SENSOR_OFF_PRE_SHA_MASK);
> + mali_c55_ctx_write(mali_c55, MALI_C55_REG_SENSOR_OFF_PRE_SHA_01,
> + p->chan01 & MALI_C55_SENSOR_OFF_PRE_SHA_MASK);
> + mali_c55_ctx_write(mali_c55, MALI_C55_REG_SENSOR_OFF_PRE_SHA_10,
> + p->chan10 & MALI_C55_SENSOR_OFF_PRE_SHA_MASK);
> + mali_c55_ctx_write(mali_c55, MALI_C55_REG_SENSOR_OFF_PRE_SHA_11,
> + p->chan11 & MALI_C55_SENSOR_OFF_PRE_SHA_MASK);
> +
> + /*
> + * The average offset is applied as a global offset for the digital
> + * gain block
> + */
> + global_offset = (p->chan00 + p->chan01 + p->chan10 + p->chan11) >> 2;
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_DIGITAL_GAIN_OFFSET,
> + MALI_C55_DIGITAL_GAIN_OFFSET_MASK,
> + global_offset);
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_BYPASS_3,
> + MALI_C55_REG_BYPASS_3_SENSOR_OFFSET_PRE_SH,
> + 0x00);
> +}
> +
> +static void mali_c55_params_aexp_hist(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block)
> +{
> + u32 disable_mask;
> + u32 disable_val;
> + u32 base;
> +
> + if (block.header->type == MALI_C55_PARAM_BLOCK_AEXP_HIST) {
> + disable_mask = MALI_C55_AEXP_HIST_DISABLE_MASK;
> + disable_val = MALI_C55_AEXP_HIST_DISABLE;
> + base = MALI_C55_REG_AEXP_HIST_BASE;
> + } else {
> + disable_mask = MALI_C55_AEXP_IHIST_DISABLE_MASK;
> + disable_val = MALI_C55_AEXP_IHIST_DISABLE;
> + base = MALI_C55_REG_AEXP_IHIST_BASE;
> + }
> + struct mali_c55_params_aexp_hist *params = block.aexp_hist;
> +
> + if (!block.header->enabled) {
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
> + disable_mask, disable_val);
> + return;
> + }
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
> + disable_mask, false);
> +
> + mali_c55_ctx_update_bits(mali_c55, base + MALI_C55_AEXP_HIST_SKIP_OFFSET,
> + MALI_C55_AEXP_HIST_SKIP_X_MASK, params->skip_x);
> + mali_c55_ctx_update_bits(mali_c55, base + MALI_C55_AEXP_HIST_SKIP_OFFSET,
> + MALI_C55_AEXP_HIST_OFFSET_X_MASK,
> + MALI_C55_AEXP_HIST_OFFSET_X(params->offset_x));
> + mali_c55_ctx_update_bits(mali_c55, base + MALI_C55_AEXP_HIST_SKIP_OFFSET,
> + MALI_C55_AEXP_HIST_SKIP_Y_MASK,
> + MALI_C55_AEXP_HIST_SKIP_Y(params->skip_y));
> + mali_c55_ctx_update_bits(mali_c55, base + MALI_C55_AEXP_HIST_SKIP_OFFSET,
> + MALI_C55_AEXP_HIST_OFFSET_Y_MASK,
> + MALI_C55_AEXP_HIST_OFFSET_Y(params->offset_y));
> +
> + mali_c55_ctx_update_bits(mali_c55, base + MALI_C55_AEXP_HIST_SCALE_OFFSET,
> + MALI_C55_AEXP_HIST_SCALE_BOTTOM_MASK,
> + params->scale_bottom);
> + mali_c55_ctx_update_bits(mali_c55, base + MALI_C55_AEXP_HIST_SCALE_OFFSET,
> + MALI_C55_AEXP_HIST_SCALE_TOP_MASK,
> + MALI_C55_AEXP_HIST_SCALE_TOP(params->scale_top));
> +
> + mali_c55_ctx_update_bits(mali_c55, base + MALI_C55_AEXP_HIST_PLANE_MODE_OFFSET,
> + MALI_C55_AEXP_HIST_PLANE_MODE_MASK,
> + params->plane_mode);
> +
> + if (block.header->type == MALI_C55_PARAM_BLOCK_AEXP_HIST)
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
> + MALI_C55_AEXP_HIST_SWITCH_MASK,
> + MALI_C55_AEXP_HIST_SWITCH(params->tap_point));
> +}
> +
> +static void
> +mali_c55_params_aexp_hist_weights(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block)
> +{
> + struct mali_c55_params_aexp_weights *params = block.aexp_weights;
> + u32 base;
> +
> + if (!block.header->enabled)
> + return;
> +
> + base = block.header->type == MALI_C55_PARAM_BLOCK_AEXP_HIST_WEIGHTS ?
> + MALI_C55_REG_AEXP_HIST_BASE :
> + MALI_C55_REG_AEXP_IHIST_BASE;
> +
> + mali_c55_ctx_update_bits(mali_c55,
> + base + MALI_C55_AEXP_HIST_NODES_USED_OFFSET,
> + MALI_C55_AEXP_HIST_NODES_USED_HORIZ_MASK,
> + params->nodes_used_horiz);
> + mali_c55_ctx_update_bits(mali_c55,
> + base + MALI_C55_AEXP_HIST_NODES_USED_OFFSET,
> + MALI_C55_AEXP_HIST_NODES_USED_VERT_MASK,
> + MALI_C55_AEXP_HIST_NODES_USED_VERT(params->nodes_used_vert));
> +
> + /*
> + * The zone weights array is a 225-element array of u8 values, but that
> + * is a bit annoying to handle given the ISP expects 32-bit writes. We
> + * just reinterpret it as a 57-element array of 32-bit values for the
> + * purposes of this transaction (the 3 bytes of additional space at the
> + * end of the write is just padding for the array of weights in the ISP
> + * memory space anyway, so there's no risk of overwriting other
> + * registers).
> + */
> + for (unsigned int i = 0; i < 57; i++) {
> + u32 val = ((u32 *)params->zone_weights)[i]
> + & MALI_C55_AEXP_HIST_ZONE_WEIGHT_MASK;
> + u32 addr = base + MALI_C55_AEXP_HIST_ZONE_WEIGHTS_OFFSET + (4 * i);
> +
> + mali_c55_ctx_write(mali_c55, addr, val);
> + }
> +}
> +
> +static void mali_c55_params_digital_gain(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block)
> +{
> + struct mali_c55_params_digital_gain *dgain = block.digital_gain;
> +
> + /*
> + * If the block is flagged as disabled we write a gain of 1.0, which in
> + * Q5.8 format is 256.
> + */
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_DIGITAL_GAIN,
> + MALI_C55_DIGITAL_GAIN_MASK,
> + block.header->enabled ? dgain->gain : 256);
> +}
> +
> +static void mali_c55_params_awb_gains(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block)
> +{
> + struct mali_c55_params_awb_gains *gains = block.awb_gains;
> +
> + /*
> + * There are two places AWB gains can be set in the ISP; one affects the
> + * image output data and the other affects the statistics for the
> + * AEXP-0 tap point.
> + */
> + u32 addr1 = block.header->type == MALI_C55_PARAM_BLOCK_AWB_GAINS ?
> + MALI_C55_REG_AWB_GAINS1 :
> + MALI_C55_REG_AWB_GAINS1_AEXP;
> + u32 addr2 = block.header->type == MALI_C55_PARAM_BLOCK_AWB_GAINS ?
> + MALI_C55_REG_AWB_GAINS2 :
> + MALI_C55_REG_AWB_GAINS2_AEXP;
> +
> + mali_c55_ctx_update_bits(mali_c55, addr1, MALI_C55_AWB_GAIN00_MASK,
> + gains->gain00);
> + mali_c55_ctx_update_bits(mali_c55, addr1, MALI_C55_AWB_GAIN01_MASK,
> + MALI_C55_AWB_GAIN01(gains->gain01));
> + mali_c55_ctx_update_bits(mali_c55, addr2, MALI_C55_AWB_GAIN10_MASK,
> + gains->gain10);
> + mali_c55_ctx_update_bits(mali_c55, addr2, MALI_C55_AWB_GAIN11_MASK,
> + MALI_C55_AWB_GAIN11(gains->gain11));
> +}
> +
> +static void mali_c55_params_awb_config(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block)
> +{
> + struct mali_c55_params_awb_config *params = block.awb_config;
> +
> + if (!block.header->enabled) {
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
> + MALI_C55_AWB_DISABLE_MASK,
> + MALI_C55_AWB_DISABLE_MASK);
> + return;
> + }
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
> + MALI_C55_AWB_DISABLE_MASK, false);
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_STATS_MODE,
> + MALI_C55_AWB_STATS_MODE_MASK, params->stats_mode);
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_WHITE_LEVEL,
> + MALI_C55_AWB_WHITE_LEVEL_MASK, params->white_level);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_BLACK_LEVEL,
> + MALI_C55_AWB_BLACK_LEVEL_MASK, params->black_level);
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_CR_MAX,
> + MALI_C55_AWB_CR_MAX_MASK, params->cr_max);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_CR_MIN,
> + MALI_C55_AWB_CR_MIN_MASK, params->cr_min);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_CB_MAX,
> + MALI_C55_AWB_CB_MAX_MASK, params->cb_max);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_CB_MIN,
> + MALI_C55_AWB_CB_MIN_MASK, params->cb_min);
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_NODES_USED,
> + MALI_C55_AWB_NODES_USED_HORIZ_MASK,
> + params->nodes_used_horiz);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_NODES_USED,
> + MALI_C55_AWB_NODES_USED_VERT_MASK,
> + MALI_C55_AWB_NODES_USED_VERT(params->nodes_used_vert));
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_CR_HIGH,
> + MALI_C55_AWB_CR_HIGH_MASK, params->cr_high);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_CR_LOW,
> + MALI_C55_AWB_CR_LOW_MASK, params->cr_low);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_CB_HIGH,
> + MALI_C55_AWB_CB_HIGH_MASK, params->cb_high);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_AWB_CB_LOW,
> + MALI_C55_AWB_CB_LOW_MASK, params->cb_low);
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_METERING_CONFIG,
> + MALI_C55_AWB_SWITCH_MASK,
> + MALI_C55_AWB_SWITCH(params->tap_point));
> +}
> +
> +static void mali_c55_params_lsc_config(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block)
> +{
> + struct mali_c55_params_mesh_shading_config *params = block.shading_config;
> + unsigned int i;
> + u32 addr;
> +
> + if (!block.header->enabled) {
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_ENABLE_MASK,
> + false);
> + return;
> + }
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_ENABLE_MASK, true);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_MESH_SHOW_MASK,
> + MALI_C55_MESH_SHADING_MESH_SHOW(params->mesh_show));
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_SCALE_MASK,
> + MALI_C55_MESH_SHADING_SCALE(params->mesh_scale));
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_PAGE_R_MASK,
> + MALI_C55_MESH_SHADING_PAGE_R(params->mesh_page_r));
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_PAGE_G_MASK,
> + MALI_C55_MESH_SHADING_PAGE_G(params->mesh_page_g));
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_PAGE_B_MASK,
> + MALI_C55_MESH_SHADING_PAGE_B(params->mesh_page_b));
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_MESH_WIDTH_MASK,
> + MALI_C55_MESH_SHADING_MESH_WIDTH(params->mesh_width));
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_CONFIG,
> + MALI_C55_MESH_SHADING_MESH_HEIGHT_MASK,
> + MALI_C55_MESH_SHADING_MESH_HEIGHT(params->mesh_height));
> +
> + for (i = 0; i < MALI_C55_NUM_MESH_SHADING_ELEMENTS; i++) {
> + addr = MALI_C55_REG_MESH_SHADING_TABLES + (i * 4);
> + mali_c55_ctx_write(mali_c55, addr, params->mesh[i]);
> + }
> +}
> +
> +static void mali_c55_params_lsc_selection(struct mali_c55 *mali_c55,
> + union mali_c55_params_block block)
> +{
> + struct mali_c55_params_mesh_shading_selection *params =
> + block.shading_selection;
> +
> + if (!block.header->enabled)
> + return;
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_ALPHA_BANK,
> + MALI_C55_MESH_SHADING_ALPHA_BANK_R_MASK,
> + params->mesh_alpha_bank_r);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_ALPHA_BANK,
> + MALI_C55_MESH_SHADING_ALPHA_BANK_G_MASK,
> + MALI_C55_MESH_SHADING_ALPHA_BANK_G(params->mesh_alpha_bank_g));
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_ALPHA_BANK,
> + MALI_C55_MESH_SHADING_ALPHA_BANK_B_MASK,
> + MALI_C55_MESH_SHADING_ALPHA_BANK_B(params->mesh_alpha_bank_b));
> +
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_ALPHA,
> + MALI_C55_MESH_SHADING_ALPHA_R_MASK,
> + params->mesh_alpha_r);
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_ALPHA,
> + MALI_C55_MESH_SHADING_ALPHA_G_MASK,
> + MALI_C55_MESH_SHADING_ALPHA_G(params->mesh_alpha_g));
> + mali_c55_ctx_update_bits(mali_c55, MALI_C55_REG_MESH_SHADING_ALPHA,
> + MALI_C55_MESH_SHADING_ALPHA_B_MASK,
> + MALI_C55_MESH_SHADING_ALPHA_B(params->mesh_alpha_b));
> +
> + mali_c55_ctx_update_bits(mali_c55,
> + MALI_C55_REG_MESH_SHADING_MESH_STRENGTH,
> + MALI_c55_MESH_STRENGTH_MASK,
> + params->mesh_strength);
> +}
> +
> +static const struct mali_c55_block_handler mali_c55_block_handlers[] = {
> + [MALI_C55_PARAM_BLOCK_SENSOR_OFFS] = {
> + .size = sizeof(struct mali_c55_params_sensor_off_preshading),
> + .handler = &mali_c55_params_sensor_offs,
> + },
> + [MALI_C55_PARAM_BLOCK_AEXP_HIST] = {
> + .size = sizeof(struct mali_c55_params_aexp_hist),
> + .handler = &mali_c55_params_aexp_hist,
> + },
> + [MALI_C55_PARAM_BLOCK_AEXP_IHIST] = {
> + .size = sizeof(struct mali_c55_params_aexp_hist),
> + .handler = &mali_c55_params_aexp_hist,
> + },
> + [MALI_C55_PARAM_BLOCK_AEXP_HIST_WEIGHTS] = {
> + .size = sizeof(struct mali_c55_params_aexp_weights),
> + .handler = &mali_c55_params_aexp_hist_weights,
> + },
> + [MALI_C55_PARAM_BLOCK_AEXP_IHIST_WEIGHTS] = {
> + .size = sizeof(struct mali_c55_params_aexp_weights),
> + .handler = &mali_c55_params_aexp_hist_weights,
> + },
> + [MALI_C55_PARAM_BLOCK_DIGITAL_GAIN] = {
> + .size = sizeof(struct mali_c55_params_digital_gain),
> + .handler = &mali_c55_params_digital_gain,
> + },
> + [MALI_C55_PARAM_BLOCK_AWB_GAINS] = {
> + .size = sizeof(struct mali_c55_params_awb_gains),
> + .handler = &mali_c55_params_awb_gains,
> + },
> + [MALI_C55_PARAM_BLOCK_AWB_CONFIG] = {
> + .size = sizeof(struct mali_c55_params_awb_config),
> + .handler = &mali_c55_params_awb_config,
> + },
> + [MALI_C55_PARAM_BLOCK_AWB_GAINS_AEXP] = {
> + .size = sizeof(struct mali_c55_params_awb_gains),
> + .handler = &mali_c55_params_awb_gains,
> + },
> + [MALI_C55_PARAM_MESH_SHADING_CONFIG] = {
> + .size = sizeof(struct mali_c55_params_mesh_shading_config),
> + .handler = &mali_c55_params_lsc_config,
> + },
> + [MALI_C55_PARAM_MESH_SHADING_SELECTION] = {
> + .size = sizeof(struct mali_c55_params_mesh_shading_selection),
> + .handler = &mali_c55_params_lsc_selection,
> + },
> +};
> +
> +static int mali_c55_params_enum_fmt_meta_out(struct file *file, void *fh,
> + struct v4l2_fmtdesc *f)
> +{
> + if (f->index)
> + return -EINVAL;
> +
> + f->pixelformat = V4L2_META_FMT_MALI_C55_PARAMS;
> +
> + return 0;
> +}
> +
> +static int mali_c55_params_g_fmt_meta_out(struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + static const struct v4l2_meta_format mfmt = {
> + .dataformat = V4L2_META_FMT_MALI_C55_PARAMS,
> + .buffersize = sizeof(struct mali_c55_params_buffer),
> + };
> +
> + f->fmt.meta = mfmt;
> +
> + return 0;
> +}
> +
> +static int mali_c55_params_querycap(struct file *file,
> + void *priv, struct v4l2_capability *cap)
> +{
> + strscpy(cap->driver, MALI_C55_DRIVER_NAME, sizeof(cap->driver));
> + strscpy(cap->card, "ARM Mali-C55 ISP", sizeof(cap->card));
> +
> + return 0;
> +}
> +
> +static const struct v4l2_ioctl_ops mali_c55_params_v4l2_ioctl_ops = {
> + .vidioc_reqbufs = vb2_ioctl_reqbufs,
> + .vidioc_querybuf = vb2_ioctl_querybuf,
> + .vidioc_create_bufs = vb2_ioctl_create_bufs,
> + .vidioc_qbuf = vb2_ioctl_qbuf,
> + .vidioc_expbuf = vb2_ioctl_expbuf,
> + .vidioc_dqbuf = vb2_ioctl_dqbuf,
> + .vidioc_prepare_buf = vb2_ioctl_prepare_buf,
> + .vidioc_streamon = vb2_ioctl_streamon,
> + .vidioc_streamoff = vb2_ioctl_streamoff,
> + .vidioc_enum_fmt_meta_out = mali_c55_params_enum_fmt_meta_out,
> + .vidioc_g_fmt_meta_out = mali_c55_params_g_fmt_meta_out,
> + .vidioc_s_fmt_meta_out = mali_c55_params_g_fmt_meta_out,
> + .vidioc_try_fmt_meta_out = mali_c55_params_g_fmt_meta_out,
> + .vidioc_querycap = mali_c55_params_querycap,
> + .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
> + .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
> +};
> +
> +static const struct v4l2_file_operations mali_c55_params_v4l2_fops = {
> + .owner = THIS_MODULE,
> + .unlocked_ioctl = video_ioctl2,
> + .open = v4l2_fh_open,
> + .release = vb2_fop_release,
> + .poll = vb2_fop_poll,
> + .mmap = vb2_fop_mmap,
> +};
> +
> +static int
> +mali_c55_params_queue_setup(struct vb2_queue *q, unsigned int *num_buffers,
> + unsigned int *num_planes, unsigned int sizes[],
> + struct device *alloc_devs[])
> +{
> + if (*num_planes && *num_planes > 1)
> + return -EINVAL;
> +
> + if (sizes[0] && sizes[0] < sizeof(struct mali_c55_params_buffer))
> + return -EINVAL;
> +
> + *num_planes = 1;
> +
> + if (!sizes[0])
> + sizes[0] = sizeof(struct mali_c55_params_buffer);
> +
> + return 0;
> +}
> +
> +static void mali_c55_params_buf_queue(struct vb2_buffer *vb)
> +{
> + struct mali_c55_params *params = vb2_get_drv_priv(vb->vb2_queue);
> + struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
> + struct mali_c55_buffer *buf = container_of(vbuf,
> + struct mali_c55_buffer, vb);
> +
> + vb2_set_plane_payload(vb, 0, sizeof(struct mali_c55_params_buffer));
> +
> + spin_lock(¶ms->buffers.lock);
> + list_add_tail(&buf->queue, ¶ms->buffers.queue);
> + spin_unlock(¶ms->buffers.lock);
> +}
> +
> +static int mali_c55_params_start_streaming(struct vb2_queue *q,
> + unsigned int count)
> +{
> + struct mali_c55_params *params = vb2_get_drv_priv(q);
> + struct mali_c55 *mali_c55 = params->mali_c55;
> + int ret;
> +
> + ret = video_device_pipeline_start(¶ms->vdev,
> + ¶ms->mali_c55->pipe);
> + if (ret)
> + return ret;
> +
> + if (mali_c55->pipe.start_count == mali_c55->pipe.required_count) {
> + ret = v4l2_subdev_enable_streams(&mali_c55->isp.sd,
> + MALI_C55_ISP_PAD_SOURCE_VIDEO,
> + BIT(0));
> + if (ret)
> + goto err_stop_pipeline;
> + }
> +
> + return 0;
> +
> +err_stop_pipeline:
> + video_device_pipeline_stop(¶ms->vdev);
When a failure happens you need to return all queued buffers to vb2 in
the QUEUED state.
> +
> + return ret;
> +}
> +
> +static void mali_c55_params_stop_streaming(struct vb2_queue *q)
> +{
> + struct mali_c55_params *params = vb2_get_drv_priv(q);
> + struct mali_c55_buffer *buf, *tmp;
> +
> + spin_lock(¶ms->buffers.lock);
> +
> + list_for_each_entry_safe(buf, tmp, ¶ms->buffers.queue, queue) {
> + list_del(&buf->queue);
> + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
> + }
This can be turned into a helper function that takes the state as an
argument, to be used in the start_streaming error path. It may even be
possible to share the helper with all video devices in this driver.
> +
> + spin_unlock(¶ms->buffers.lock);
> +
> + video_device_pipeline_stop(¶ms->vdev);
I think you need to stop the ISP too, if this is the first video device
being stopped. You should return buffers to vb2 only after stopping the
ISP.
This may be fixed by stopping the ISP, but currently I think you're
racing with mali_c55_params_write_config()
> +}
> +
> +static const struct vb2_ops mali_c55_params_vb2_ops = {
> + .queue_setup = mali_c55_params_queue_setup,
> + .buf_queue = mali_c55_params_buf_queue,
> + .wait_prepare = vb2_ops_wait_prepare,
> + .wait_finish = vb2_ops_wait_finish,
> + .start_streaming = mali_c55_params_start_streaming,
> + .stop_streaming = mali_c55_params_stop_streaming,
> +};
> +
> +void mali_c55_params_write_config(struct mali_c55 *mali_c55)
> +{
> + struct mali_c55_params *params = &mali_c55->params;
> + enum vb2_buffer_state state = VB2_BUF_STATE_DONE;
> + struct mali_c55_params_buffer *config;
> + struct mali_c55_buffer *buf;
> + size_t block_offset = 0;
> + size_t max_offset;
> +
> + spin_lock(¶ms->buffers.lock);
> +
> + buf = list_first_entry_or_null(¶ms->buffers.queue,
> + struct mali_c55_buffer, queue);
> + if (buf)
> + list_del(&buf->queue);
> + spin_unlock(¶ms->buffers.lock);
> +
> + if (!buf)
> + return;
If this happens we'll lose synchronization. I suppose we can't do much
about this, we really need a request-based API.
> +
> + buf->vb.sequence = mali_c55->isp.frame_sequence;
> + config = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
> +
> + if (config->total_size > MALI_C55_PARAMS_MAX_SIZE) {
> + dev_dbg(mali_c55->dev, "Invalid parameters buffer size %u\n",
> + config->total_size);
> + state = VB2_BUF_STATE_ERROR;
> + goto err_buffer_done;
> + }
> +
> + max_offset = config->total_size - sizeof(struct mali_c55_params_block_header);
> +
> + /* Walk the list of parameter blocks and process them. */
> + while (block_offset < max_offset) {
> + const struct mali_c55_block_handler *block_handler;
> + union mali_c55_params_block block;
> +
> + block = (union mali_c55_params_block)
> + &config->data[block_offset];
> +
> + if (block.header->type >= MALI_C55_PARAM_BLOCK_SENTINEL) {
> + dev_dbg(mali_c55->dev, "Invalid parameters block type\n");
> + state = VB2_BUF_STATE_ERROR;
> + goto err_buffer_done;
> + }
> +
> + if (block_offset + block.header->size >= config->total_size) {
> + dev_dbg(mali_c55->dev, "Parameters block too large\n");
> + state = VB2_BUF_STATE_ERROR;
> + goto err_buffer_done;
> + }
> +
> + block_handler = &mali_c55_block_handlers[block.header->type];
> + if (block.header->size != block_handler->size) {
> + dev_dbg(mali_c55->dev, "Invalid parameters block size\n");
> + state = VB2_BUF_STATE_ERROR;
> + goto err_buffer_done;
> + }
Most of the validation should be done with the buffer is queued.
Furthermore, you need to make a copy of the data. See the latest version
of the rkisp1 extensible parameters format series. There may be other
recent improvements in that series worth copying here.
> +
> + block_handler->handler(mali_c55, block);
> +
> + block_offset += block.header->size;
> + }
> +
> +err_buffer_done:
> + vb2_buffer_done(&buf->vb.vb2_buf, state);
> +}
> +
> +void mali_c55_unregister_params(struct mali_c55 *mali_c55)
> +{
> + struct mali_c55_params *params = &mali_c55->params;
> +
> + if (!video_is_registered(¶ms->vdev))
> + return;
> +
> + vb2_video_unregister_device(¶ms->vdev);
> + media_entity_cleanup(¶ms->vdev.entity);
> + mutex_destroy(¶ms->lock);
> +}
> +
> +int mali_c55_register_params(struct mali_c55 *mali_c55)
> +{
> + struct mali_c55_params *params = &mali_c55->params;
> + struct video_device *vdev = ¶ms->vdev;
> + struct vb2_queue *vb2q = ¶ms->queue;
> + int ret;
> +
> + mutex_init(¶ms->lock);
> + INIT_LIST_HEAD(¶ms->buffers.queue);
> +
> + params->pad.flags = MEDIA_PAD_FL_SOURCE;
> + ret = media_entity_pads_init(¶ms->vdev.entity, 1, ¶ms->pad);
> + if (ret)
> + goto err_destroy_mutex;
> +
> + vb2q->type = V4L2_BUF_TYPE_META_OUTPUT;
> + vb2q->io_modes = VB2_MMAP | VB2_DMABUF;
> + vb2q->drv_priv = params;
> + vb2q->mem_ops = &vb2_dma_contig_memops;
> + vb2q->ops = &mali_c55_params_vb2_ops;
> + vb2q->buf_struct_size = sizeof(struct mali_c55_buffer);
> + vb2q->min_queued_buffers = 1;
> + vb2q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
> + vb2q->lock = ¶ms->lock;
> + vb2q->dev = mali_c55->dev;
> +
> + ret = vb2_queue_init(vb2q);
> + if (ret) {
> + dev_err(mali_c55->dev, "params vb2 queue init failed\n");
> + goto err_cleanup_entity;
> + }
> +
> + strscpy(params->vdev.name, "mali-c55 3a params",
> + sizeof(params->vdev.name));
> + vdev->release = video_device_release_empty;
> + vdev->fops = &mali_c55_params_v4l2_fops;
> + vdev->ioctl_ops = &mali_c55_params_v4l2_ioctl_ops;
> + vdev->lock = ¶ms->lock;
> + vdev->v4l2_dev = &mali_c55->v4l2_dev;
> + vdev->queue = ¶ms->queue;
> + vdev->device_caps = V4L2_CAP_META_OUTPUT | V4L2_CAP_STREAMING;
Shouldn't you set V4L2_CAP_IO_MC and implement media bus code-based
format enumeration ?
> + vdev->vfl_dir = VFL_DIR_TX;
> + video_set_drvdata(vdev, params);
> +
> + ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
> + if (ret) {
> + dev_err(mali_c55->dev,
> + "failed to register params video device\n");
> + goto err_release_vb2q;
> + }
> +
> + params->mali_c55 = mali_c55;
> +
> + return 0;
> +
> +err_release_vb2q:
> + vb2_queue_release(vb2q);
> +err_cleanup_entity:
> + media_entity_cleanup(¶ms->vdev.entity);
> +err_destroy_mutex:
> + mutex_destroy(¶ms->lock);
> +
> + return ret;
> +}
> diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-registers.h b/drivers/media/platform/arm/mali-c55/mali-c55-registers.h
> index e72e749b81d5..f2cad402492c 100644
> --- a/drivers/media/platform/arm/mali-c55/mali-c55-registers.h
> +++ b/drivers/media/platform/arm/mali-c55/mali-c55-registers.h
> @@ -159,6 +159,23 @@ enum mali_c55_interrupts {
> #define MALI_C55_BAYER_ORDER_GBRG 2
> #define MALI_C55_BAYER_ORDER_BGGR 3
>
> +#define MALI_C55_REG_METERING_CONFIG 0x18ed0
> +#define MALI_C55_5BIN_HIST_DISABLE_MASK BIT(0)
> +#define MALI_C55_5BIN_HIST_SWITCH_MASK GENMASK(2, 1)
> +#define MALI_C55_5BIN_HIST_SWITCH(x) 1
> +#define MALI_C55_AF_DISABLE_MASK BIT(4)
> +#define MALI_C55_AF_SWITCH_MASK BIT(5)
> +#define MALI_C55_AWB_DISABLE_MASK BIT(8)
> +#define MALI_C55_AWB_SWITCH_MASK BIT(9)
> +#define MALI_C55_AWB_SWITCH(x) ((x) << 9)
> +#define MALI_C55_AEXP_HIST_DISABLE_MASK BIT(12)
> +#define MALI_C55_AEXP_HIST_DISABLE (0x01 << 12)
> +#define MALI_C55_AEXP_HIST_SWITCH_MASK GENMASK(14, 13)
> +#define MALI_C55_AEXP_HIST_SWITCH(x) ((x) << 13)
> +#define MALI_C55_AEXP_IHIST_DISABLE_MASK BIT(16)
> +#define MALI_C55_AEXP_IHIST_DISABLE (0x01 << 12)
> +#define MALI_C55_AEXP_SRC_MASK BIT(24)
> +
> #define MALI_C55_REG_TPG_CH0 0x18ed8
> #define MALI_C55_TEST_PATTERN_ON_OFF BIT(0)
> #define MALI_C55_TEST_PATTERN_RGB_MASK BIT(1)
> @@ -179,6 +196,11 @@ enum mali_c55_interrupts {
> #define MALI_C55_REG_CONFIG_SPACES_OFFSET 0x0ab6c
> #define MALI_C55_CONFIG_SPACE_SIZE 0x1231c
>
> +#define MALI_C55_REG_DIGITAL_GAIN 0x1926c
> +#define MALI_C55_DIGITAL_GAIN_MASK GENMASK(12, 0)
> +#define MALI_C55_REG_DIGITAL_GAIN_OFFSET 0x19270
> +#define MALI_C55_DIGITAL_GAIN_OFFSET_MASK GENMASK(19, 0)
> +
> #define MALI_C55_REG_SINTER_CONFIG 0x19348
> #define MALI_C55_SINTER_VIEW_FILTER_MASK GENMASK(1, 0)
> #define MALI_C55_SINTER_SCALE_MODE_MASK GENMASK(3, 2)
> @@ -187,6 +209,59 @@ enum mali_c55_interrupts {
> #define MALI_C55_SINTER_INT_SELECT_MASK BIT(6)
> #define MALI_C55_SINTER_RM_ENABLE_MASK BIT(7)
>
> +/* Black Level Correction Configuration */
> +#define MALI_C55_REG_SENSOR_OFF_PRE_SHA_00 0x1abcc
> +#define MALI_C55_REG_SENSOR_OFF_PRE_SHA_01 0x1abd0
> +#define MALI_C55_REG_SENSOR_OFF_PRE_SHA_10 0x1abd4
> +#define MALI_C55_REG_SENSOR_OFF_PRE_SHA_11 0x1abd8
> +#define MALI_C55_SENSOR_OFF_PRE_SHA_MASK 0xfffff
> +
> +/* Lens Mesh Shading Configuration */
> +#define MALI_C55_REG_MESH_SHADING_TABLES 0x13074
> +#define MALI_C55_REG_MESH_SHADING_CONFIG 0x1abfc
> +#define MALI_C55_MESH_SHADING_ENABLE_MASK BIT(0)
> +#define MALI_C55_MESH_SHADING_MESH_SHOW_MASK BIT(1)
> +#define MALI_C55_MESH_SHADING_MESH_SHOW(x) ((x) << 1)
> +#define MALI_C55_MESH_SHADING_SCALE_MASK GENMASK(4, 2)
> +#define MALI_C55_MESH_SHADING_SCALE(x) ((x) << 2)
> +#define MALI_C55_MESH_SHADING_PAGE_R_MASK GENMASK(9, 8)
> +#define MALI_C55_MESH_SHADING_PAGE_R(x) ((x) << 8)
> +#define MALI_C55_MESH_SHADING_PAGE_G_MASK GENMASK(11, 10)
> +#define MALI_C55_MESH_SHADING_PAGE_G(x) ((x) << 10)
> +#define MALI_C55_MESH_SHADING_PAGE_B_MASK GENMASK(13, 12)
> +#define MALI_C55_MESH_SHADING_PAGE_B(x) ((x) << 12)
> +#define MALI_C55_MESH_SHADING_MESH_WIDTH_MASK GENMASK(21, 16)
> +#define MALI_C55_MESH_SHADING_MESH_WIDTH(x) ((x) << 16)
> +#define MALI_C55_MESH_SHADING_MESH_HEIGHT_MASK GENMASK(29, 24)
> +#define MALI_C55_MESH_SHADING_MESH_HEIGHT(x) ((x) << 24)
> +
> +#define MALI_C55_REG_MESH_SHADING_ALPHA_BANK 0x1ac04
> +#define MALI_C55_MESH_SHADING_ALPHA_BANK_R_MASK GENMASK(2, 0)
> +#define MALI_C55_MESH_SHADING_ALPHA_BANK_G_MASK GENMASK(5, 3)
> +#define MALI_C55_MESH_SHADING_ALPHA_BANK_G(x) ((x) << 3)
> +#define MALI_C55_MESH_SHADING_ALPHA_BANK_B_MASK GENMASK(8, 6)
> +#define MALI_C55_MESH_SHADING_ALPHA_BANK_B(x) ((x) << 6)
> +#define MALI_C55_REG_MESH_SHADING_ALPHA 0x1ac08
> +#define MALI_C55_MESH_SHADING_ALPHA_R_MASK GENMASK(7, 0)
> +#define MALI_C55_MESH_SHADING_ALPHA_G_MASK GENMASK(15, 8)
> +#define MALI_C55_MESH_SHADING_ALPHA_G(x) ((x) << 8)
> +#define MALI_C55_MESH_SHADING_ALPHA_B_MASK GENMASK(23, 16)
> +#define MALI_C55_MESH_SHADING_ALPHA_B(x) ((x) << 16)
> +#define MALI_C55_REG_MESH_SHADING_MESH_STRENGTH 0x1ac0c
> +#define MALI_c55_MESH_STRENGTH_MASK GENMASK(15, 0)
> +
> +/* AWB Gains Configuration */
> +#define MALI_C55_REG_AWB_GAINS1 0x1ac10
> +#define MALI_C55_AWB_GAIN00_MASK GENMASK(11, 0)
> +#define MALI_C55_AWB_GAIN01_MASK GENMASK(27, 16)
> +#define MALI_C55_AWB_GAIN01(x) ((x) << 16)
> +#define MALI_C55_REG_AWB_GAINS2 0x1ac14
> +#define MALI_C55_AWB_GAIN10_MASK GENMASK(11, 0)
> +#define MALI_C55_AWB_GAIN11_MASK GENMASK(27, 16)
> +#define MALI_C55_AWB_GAIN11(x) ((x) << 16)
> +#define MALI_C55_REG_AWB_GAINS1_AEXP 0x1ac18
> +#define MALI_C55_REG_AWB_GAINS2_AEXP 0x1ac1c
> +
> /* Colour Correction Matrix Configuration */
> #define MALI_C55_REG_CCM_ENABLE 0x1b07c
> #define MALI_C55_CCM_ENABLE_MASK BIT(0)
> @@ -209,6 +284,59 @@ enum mali_c55_interrupts {
> #define MALI_C55_REG_CCM_ANTIFOG_OFFSET_B 0x1b0c8
> #define MALI_C55_CCM_ANTIFOG_OFFSET_MASK GENMASK(11, 0)
>
> +/* AWB Statistics Configuration */
> +#define MALI_C55_REG_AWB_STATS_MODE 0x1b29c
> +#define MALI_C55_AWB_STATS_MODE_MASK BIT(0)
> +#define MALI_C55_REG_AWB_WHITE_LEVEL 0x1b2a0
> +#define MALI_C55_AWB_WHITE_LEVEL_MASK GENMASK(9, 0)
> +#define MALI_C55_REG_AWB_BLACK_LEVEL 0x1b2a4
> +#define MALI_C55_AWB_BLACK_LEVEL_MASK GENMASK(9, 0)
> +#define MALI_C55_REG_AWB_CR_MAX 0x1b2a8
> +#define MALI_C55_AWB_CR_MAX_MASK GENMASK(11, 0)
> +#define MALI_C55_REG_AWB_CR_MIN 0x1b2ac
> +#define MALI_C55_AWB_CR_MIN_MASK GENMASK(11, 0)
> +#define MALI_C55_REG_AWB_CB_MAX 0x1b2b0
> +#define MALI_C55_AWB_CB_MAX_MASK GENMASK(11, 0)
> +#define MALI_C55_REG_AWB_CB_MIN 0x1b2b4
> +#define MALI_C55_AWB_CB_MIN_MASK GENMASK(11, 0)
> +#define MALI_C55_REG_AWB_NODES_USED 0x1b2c4
> +#define MALI_C55_AWB_NODES_USED_HORIZ_MASK GENMASK(7, 0)
> +#define MALI_C55_AWB_NODES_USED_VERT_MASK GENMASK(15, 8)
> +#define MALI_C55_AWB_NODES_USED_VERT(x) ((x) << 8)
> +#define MALI_C55_REG_AWB_CR_HIGH 0x1b2c8
> +#define MALI_C55_AWB_CR_HIGH_MASK GENMASK(11, 0)
> +#define MALI_C55_REG_AWB_CR_LOW 0x1b2cc
> +#define MALI_C55_AWB_CR_LOW_MASK GENMASK(11, 0)
> +#define MALI_C55_REG_AWB_CB_HIGH 0x1b2d0
> +#define MALI_C55_AWB_CB_HIGH_MASK GENMASK(11, 0)
> +#define MALI_C55_REG_AWB_CB_LOW 0x1b2d4
> +#define MALI_C55_AWB_CB_LOW_MASK GENMASK(11, 0)
> +
> +/* AEXP Metering Histogram Configuration */
> +#define MALI_C55_REG_AEXP_HIST_BASE 0x1b730
> +#define MALI_C55_REG_AEXP_IHIST_BASE 0x1bbac
> +#define MALI_C55_AEXP_HIST_SKIP_OFFSET 0
> +#define MALI_C55_AEXP_HIST_SKIP_X_MASK GENMASK(2, 0)
> +#define MALI_c55_AEXP_HIST_SKIP_X(x) 0
> +#define MALI_C55_AEXP_HIST_OFFSET_X_MASK BIT(3)
> +#define MALI_C55_AEXP_HIST_OFFSET_X(x) ((x) << 3)
> +#define MALI_C55_AEXP_HIST_SKIP_Y_MASK GENMASK(6, 4)
> +#define MALI_C55_AEXP_HIST_SKIP_Y(x) ((x) << 4)
> +#define MALI_C55_AEXP_HIST_OFFSET_Y_MASK BIT(7)
> +#define MALI_C55_AEXP_HIST_OFFSET_Y(x) ((x) << 7)
> +#define MALI_C55_AEXP_HIST_SCALE_OFFSET 4
> +#define MALI_C55_AEXP_HIST_SCALE_BOTTOM_MASK GENMASK(3, 0)
> +#define MALI_C55_AEXP_HIST_SCALE_TOP_MASK GENMASK(7, 4)
> +#define MALI_C55_AEXP_HIST_SCALE_TOP(x) ((x) << 4)
> +#define MALI_C55_AEXP_HIST_PLANE_MODE_OFFSET 16
> +#define MALI_C55_AEXP_HIST_PLANE_MODE_MASK GENMASK(2, 0)
> +#define MALI_C55_AEXP_HIST_NODES_USED_OFFSET 52
> +#define MALI_C55_AEXP_HIST_NODES_USED_HORIZ_MASK GENMASK(7, 0)
> +#define MALI_C55_AEXP_HIST_NODES_USED_VERT_MASK GENMASK(15, 8)
> +#define MALI_C55_AEXP_HIST_NODES_USED_VERT(x) ((x) << 8)
> +#define MALI_C55_AEXP_HIST_ZONE_WEIGHTS_OFFSET 56
> +#define MALI_C55_AEXP_HIST_ZONE_WEIGHT_MASK 0x0f0f0f0f
> +
> /*
> * The Mali-C55 ISP has up to two output pipes; known as full resolution and
> * down scaled. The register space for these is laid out identically, but offset
--
Regards,
Laurent Pinchart
