| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250915170743.106249-12-niklas.soderlund+renesas@ragnatech.se>
Date: Mon, 15 Sep 2025 19:07:42 +0200
From: Niklas Söderlund <niklas.soderlund+renesas@...natech.se>
To: Mauro Carvalho Chehab <mchehab@...nel.org>,
Jacopo Mondi <jacopo.mondi@...asonboard.com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
linux-media@...r.kernel.org,
linux-renesas-soc@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: Niklas Söderlund <niklas.soderlund+renesas@...natech.se>
Subject: [PATCH v2 11/12] media: rppx1: Add support for Bayer Demosaicing
Extend the RPPX1 driver to allow setting the Bayer Demosaicing
configuration using the RkISP1 parameter buffer format. It uses the
RPPX1 framework for parameters and its writer abstraction to allow the
user to control how (and when) configuration is applied to the RPPX1.
As the RkISP1 parameters are all 6- or 10-bit while RPP are either 8- or
16-bit, the driver corrects for this allowing the RkISP1 parameters to
be used.
One particularity is that the RkISP1 driver lumps all settings in the
FILT_LUM_WEIGHT register in a single value in the configuration buffer.
As the format is slightly different for RPP we need to break it out and
fix it before applying it to the RPP.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@...natech.se>
---
.../platform/dreamchip/rppx1/rpp_params.c | 5 +
.../media/platform/dreamchip/rppx1/rppx1_db.c | 112 ++++++++++++++++++
2 files changed, 117 insertions(+)
diff --git a/drivers/media/platform/dreamchip/rppx1/rpp_params.c b/drivers/media/platform/dreamchip/rppx1/rpp_params.c
index 323ee792426e..ff075d6b81a7 100644
--- a/drivers/media/platform/dreamchip/rppx1/rpp_params.c
+++ b/drivers/media/platform/dreamchip/rppx1/rpp_params.c
@@ -30,6 +30,11 @@ int rppx1_params_rkisp1(struct rppx1 *rpp, struct rkisp1_ext_params_cfg *cfg,
case RKISP1_EXT_PARAMS_BLOCK_TYPE_AWB_GAIN:
module = &rpp->pre1.awbg;
break;
+ case RKISP1_EXT_PARAMS_BLOCK_TYPE_FLT:
+ case RKISP1_EXT_PARAMS_BLOCK_TYPE_BDM:
+ /* Both types handled by the same block. */
+ module = &rpp->post.db;
+ break;
case RKISP1_EXT_PARAMS_BLOCK_TYPE_CTK:
module = &rpp->post.ccor;
break;
diff --git a/drivers/media/platform/dreamchip/rppx1/rppx1_db.c b/drivers/media/platform/dreamchip/rppx1/rppx1_db.c
index 5e233896cfc8..4a2a3719d7ed 100644
--- a/drivers/media/platform/dreamchip/rppx1/rppx1_db.c
+++ b/drivers/media/platform/dreamchip/rppx1/rppx1_db.c
@@ -39,6 +39,118 @@ static int rppx1_db_probe(struct rpp_module *mod)
return 0;
}
+static int
+rppx1_db_param_rkisp1_flt(struct rpp_module *mod,
+ const union rppx1_params_rkisp1_config *block,
+ rppx1_reg_write write, void *priv)
+{
+ const struct rkisp1_ext_params_flt_config *cfg = &block->flt;
+ u32 gain, kink, min;
+
+ /* If the modules is disabled, simply bypass it. */
+ if (cfg->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) {
+ write(priv, mod->base + FILT_MODE_REG, 0);
+ return 0;
+ }
+
+ /*
+ * RkISP1 values are 10-bit, RPP are 18-bit. Conversion verified with
+ * table in datasheet and libcamera pipeline for rkisp1.
+ */
+ write(priv, mod->base + FILT_THRESH_BL0_REG, cfg->config.thresh_bl0 << 8);
+ write(priv, mod->base + FILT_THRESH_BL0_REG, cfg->config.thresh_bl1 << 8);
+ write(priv, mod->base + FILT_THRESH_SH0_REG, cfg->config.thresh_sh0 << 8);
+ write(priv, mod->base + FILT_THRESH_SH1_REG, cfg->config.thresh_sh1 << 8);
+
+ /*
+ * RkISP1 values are 6-bit, RPP are 8-bit. Conversion verified with
+ * table in datasheet and libcamera pipeline for rkisp1.
+ */
+ write(priv, mod->base + FILT_FAC_BL0_REG, cfg->config.fac_bl0 << 2);
+ write(priv, mod->base + FILT_FAC_BL1_REG, cfg->config.fac_bl1 << 2);
+ write(priv, mod->base + FILT_FAC_MID_REG, cfg->config.fac_mid << 2);
+ write(priv, mod->base + FILT_FAC_SH0_REG, cfg->config.fac_sh0 << 2);
+ write(priv, mod->base + FILT_FAC_SH1_REG, cfg->config.fac_sh1 << 2);
+
+ /*
+ * For unknown reasons the 3 fields of the FILT_LUM_WEIGHT register
+ * have been lumped together in a single field in the configuration
+ * data and written as is to the hardware. For RkISP1 the register
+ * layout is,
+ *
+ * 31:19 unused
+ * 18:16 lum_weight_gain
+ * 15:8 lum_weight_kink
+ * 7:0 lum_weight_min
+ *
+ * For RPP the register layout is similar but kink and gain have higher
+ * precision.
+ *
+ * 31 unused
+ * 30:28 lum_weight_gain
+ * 27:24 unused
+ * 23:12 lum_weight_kink
+ * 11:0 lum_weight_min
+ *
+ * Break apart the RkISP1 format, scale kink and min, and map to RPP.
+ */
+ gain = (cfg->config.lum_weight & GENMASK(18, 16)) >> 16;
+ kink = (cfg->config.lum_weight & GENMASK(15, 8)) >> 8;
+ min = cfg->config.lum_weight & GENMASK(7, 0);
+
+ write(priv, mod->base + FILT_LUM_WEIGHT_REG,
+ (gain << 28) | ((kink << 4) << 12) | (min << 4));
+
+ write(priv, mod->base + FILT_MODE_REG,
+ (cfg->config.chr_v_mode << 4) |
+ (cfg->config.chr_h_mode << 6) |
+ (cfg->config.grn_stage1 << 8) |
+ (cfg->config.mode ? FILT_MODE_FILT_MODE : 0) |
+ FILT_MODE_FILT_ENABLE);
+
+ return 0;
+}
+
+static int
+rppx1_db_param_rkisp1_bdm(struct rpp_module *mod,
+ const union rppx1_params_rkisp1_config *block,
+ rppx1_reg_write write, void *priv)
+{
+ const struct rkisp1_ext_params_bdm_config *cfg = &block->bdm;
+
+ /* If the modules is disabled, simply bypass it. */
+ if (cfg->header.flags & RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE) {
+ write(priv, mod->base + DEMOSAIC_REG, 0x400);
+ return 0;
+ }
+
+ /*
+ * Threshold for Bayer demosaicing texture detection.
+ *
+ * RkISP1 threshold are 8-bit, RPP threshold are 16-bit. Map the RkISP1
+ * value range by left shifting by 8.
+ */
+ write(priv, mod->base + DEMOSAIC_REG, cfg->config.demosaic_th << 8);
+
+ return 0;
+}
+
+static int
+rppx1_db_param_rkisp1(struct rpp_module *mod,
+ const union rppx1_params_rkisp1_config *block,
+ rppx1_reg_write write, void *priv)
+{
+ switch (block->header.type) {
+ case RKISP1_EXT_PARAMS_BLOCK_TYPE_FLT:
+ return rppx1_db_param_rkisp1_flt(mod, block, write, priv);
+ case RKISP1_EXT_PARAMS_BLOCK_TYPE_BDM:
+ return rppx1_db_param_rkisp1_bdm(mod, block, write, priv);
+ }
+
+ return -EINVAL;
+}
+
const struct rpp_module_ops rppx1_db_ops = {
.probe = rppx1_db_probe,
+ .param_rkisp1 = rppx1_db_param_rkisp1,
};
--
2.51.0
Powered by blists - more mailing lists