at91: kernel v5.15: copy config and patches from 5.10

[openwrt/openwrt.git] / target / linux / at91 / patches-5.15 / 179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch

diff --git a/target/linux/at91/patches-5.15/179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch b/target/linux/at91/patches-5.15/179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch
new file mode 100644 (file)
index 0000000..8442925
--- /dev/null
+++ b/target/linux/at91/patches-5.15/179-media-atmel-atmel-isc-create-callback-for-RLP-submod.patch
@@ -0,0 +1,95 @@
+From ece1d7059731e31875e6eb464da4fb4a16465305 Mon Sep 17 00:00:00 2001
+From: Eugen Hristev <eugen.hristev@microchip.com>
+Date: Tue, 13 Apr 2021 12:57:21 +0200
+Subject: [PATCH 179/247] media: atmel: atmel-isc: create callback for RLP
+ submodule product specific
+
+The RLP submodule is a part of the atmel-isc pipeline, and stands for
+Rounding,Limiting and Packaging. It used to extract specific data from the
+ISC pipeline. For example if we want to output greyscale 8 bit, we would
+use limiting to 8 bits, and packaging to Luma component only.
+
+Create a product specific callback for initializing the RLP submodule
+of the pipeline
+
+[hverkuil: made isc_sama5d2_config_rlp static]
+
+Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+---
+ drivers/media/platform/atmel/atmel-isc-base.c    |  6 ++----
+ drivers/media/platform/atmel/atmel-isc.h         |  3 +++
+ drivers/media/platform/atmel/atmel-sama5d2-isc.c | 10 ++++++++++
+ 3 files changed, 15 insertions(+), 4 deletions(-)
+
+--- a/drivers/media/platform/atmel/atmel-isc-base.c
++++ b/drivers/media/platform/atmel/atmel-isc-base.c
+@@ -719,11 +719,10 @@ static void isc_set_histogram(struct isc
+ static int isc_configure(struct isc_device *isc)
+ {
+       struct regmap *regmap = isc->regmap;
+-      u32 pfe_cfg0, rlp_mode, dcfg, mask, pipeline;
++      u32 pfe_cfg0, dcfg, mask, pipeline;
+       struct isc_subdev_entity *subdev = isc->current_subdev;
+ 
+       pfe_cfg0 = isc->config.sd_format->pfe_cfg0_bps;
+-      rlp_mode = isc->config.rlp_cfg_mode;
+       pipeline = isc->config.bits_pipeline;
+ 
+       dcfg = isc->config.dcfg_imode | isc->dcfg;
+@@ -736,8 +735,7 @@ static int isc_configure(struct isc_devi
+ 
+       regmap_update_bits(regmap, ISC_PFE_CFG0, mask, pfe_cfg0);
+ 
+-      regmap_update_bits(regmap, ISC_RLP_CFG + isc->offsets.rlp,
+-                         ISC_RLP_CFG_MODE_MASK, rlp_mode);
++      isc->config_rlp(isc);
+ 
+       regmap_write(regmap, ISC_DCFG + isc->offsets.dma, dcfg);
+ 
+--- a/drivers/media/platform/atmel/atmel-isc.h
++++ b/drivers/media/platform/atmel/atmel-isc.h
+@@ -230,6 +230,8 @@ struct isc_reg_offsets {
+  *                    specific CC module
+  * @config_gam:               pointer to a function that initializes product
+  *                    specific GAMMA module
++ * @config_rlp:               pointer to a function that initializes product
++ *                    specific RLP module
+  * @config_ctrls:     pointer to a functoin that initializes product
+  *                    specific v4l2 controls.
+  *
+@@ -308,6 +310,7 @@ struct isc_device {
+               void (*config_cbc)(struct isc_device *isc);
+               void (*config_cc)(struct isc_device *isc);
+               void (*config_gam)(struct isc_device *isc);
++              void (*config_rlp)(struct isc_device *isc);
+ 
+               void (*config_ctrls)(struct isc_device *isc,
+                                    const struct v4l2_ctrl_ops *ops);
+--- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
++++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
+@@ -117,6 +117,15 @@ static void isc_sama5d2_config_gam(struc
+       /* No specific gamma configuration */
+ }
+ 
++static void isc_sama5d2_config_rlp(struct isc_device *isc)
++{
++      struct regmap *regmap = isc->regmap;
++      u32 rlp_mode = isc->config.rlp_cfg_mode;
++
++      regmap_update_bits(regmap, ISC_RLP_CFG + isc->offsets.rlp,
++                         ISC_RLP_CFG_MODE_MASK, rlp_mode);
++}
++
+ /* Gamma table with gamma 1/2.2 */
+ static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
+       /* 0 --> gamma 1/1.8 */
+@@ -288,6 +297,7 @@ static int atmel_isc_probe(struct platfo
+       isc->config_cbc = isc_sama5d2_config_cbc;
+       isc->config_cc = isc_sama5d2_config_cc;
+       isc->config_gam = isc_sama5d2_config_gam;
++      isc->config_rlp = isc_sama5d2_config_rlp;
+       isc->config_ctrls = isc_sama5d2_config_ctrls;
+ 
+       isc->offsets.csc = ISC_SAMA5D2_CSC_OFFSET;