| Message ID | 20220622151918.451635-5-fsylvestre@baylibre.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Florian, On Wed, Jun 22, 2022 at 05:19:17PM +0200, Florian Sylvestre via libcamera-devel wrote: > To improve the kernel interface, a proposal has been made to the > linux-kernel [1] to improve the configuration of the Defective > Pixel Cluster Correction (DPCC). > > [1] > https://lore.kernel.org/linux-media/20220616160456.21549-1-laurent.pinchart@ideasonboard.com/ > > Update the local copy of the rkisp1-config.h to match the proposal. > > Signed-off-by: Florian Sylvestre <fsylvestre@baylibre.com> Acked-by: Paul Elder <paul.elder@ideasonboard.com> > --- > include/linux/rkisp1-config.h | 77 +++++++++++++++++++++++++++-------- > 1 file changed, 61 insertions(+), 16 deletions(-) > > diff --git a/include/linux/rkisp1-config.h b/include/linux/rkisp1-config.h > index 9be67d63..0ed3dca8 100644 > --- a/include/linux/rkisp1-config.h > +++ b/include/linux/rkisp1-config.h > @@ -117,7 +117,46 @@ > /* > * Defect Pixel Cluster Correction > */ > -#define RKISP1_CIF_ISP_DPCC_METHODS_MAX 3 > +#define RKISP1_CIF_ISP_DPCC_METHODS_MAX 3 > + > +#define RKISP1_CIF_ISP_DPCC_MODE_STAGE1_ENABLE (1U << 2) > + > +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_G_CENTER (1U << 0) > +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_RB_CENTER (1U << 1) > +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_G_3X3 (1U << 2) > +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_RB_3X3 (1U << 3) > + > +/* 0-2 for sets 1-3 */ > +#define RKISP1_CIF_ISP_DPCC_SET_USE_STAGE1_USE_SET(n) ((n) << 0) > +#define RKISP1_CIF_ISP_DPCC_SET_USE_STAGE1_USE_FIX_SET (1U << 3) > + > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_PG_GREEN_ENABLE (1U << 0) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_LC_GREEN_ENABLE (1U << 1) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RO_GREEN_ENABLE (1U << 2) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RND_GREEN_ENABLE (1U << 3) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RG_GREEN_ENABLE (1U << 4) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_PG_RED_BLUE_ENABLE (1U << 8) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_LC_RED_BLUE_ENABLE (1U << 9) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RO_RED_BLUE_ENABLE (1U << 10) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RND_RED_BLUE_ENABLE (1U << 11) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RG_RED_BLUE_ENABLE (1U << 12) > + > +#define RKISP1_CIF_ISP_DPCC_LINE_THRESH_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_LINE_THRESH_RB(v) ((v) << 8) > +#define RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_RB(v) ((v) << 8) > +#define RKISP1_CIF_ISP_DPCC_PG_FAC_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_PG_FAC_RB(v) ((v) << 8) > +#define RKISP1_CIF_ISP_DPCC_RND_THRESH_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_RND_THRESH_RB(v) ((v) << 8) > +#define RKISP1_CIF_ISP_DPCC_RG_FAC_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_RG_FAC_RB(v) ((v) << 8) > + > +#define RKISP1_CIF_ISP_DPCC_RO_LIMITS_n_G(n, v) ((v) << ((n) * 4)) > +#define RKISP1_CIF_ISP_DPCC_RO_LIMITS_n_RB(n, v) ((v) << ((n) * 4 + 2)) > + > +#define RKISP1_CIF_ISP_DPCC_RND_OFFS_n_G(n, v) ((v) << ((n) * 4)) > +#define RKISP1_CIF_ISP_DPCC_RND_OFFS_n_RB(n, v) ((v) << ((n) * 4 + 2)) > > /* > * Denoising pre filter > @@ -250,16 +289,20 @@ struct rkisp1_cif_isp_bls_config { > }; > > /** > - * struct rkisp1_cif_isp_dpcc_methods_config - Methods Configuration used by DPCC > + * struct rkisp1_cif_isp_dpcc_methods_config - DPCC methods set configuration > * > - * Methods Configuration used by Defect Pixel Cluster Correction > + * This structure stores the configuration of one set of methods for the DPCC > + * algorithm. Multiple methods can be selected in each set (independently for > + * the Green and Red/Blue components) through the @method field, the result is > + * the logical AND of all enabled methods. The remaining fields set thresholds > + * and factors for each method. > * > - * @method: Method enable bits > - * @line_thresh: Line threshold > - * @line_mad_fac: Line MAD factor > - * @pg_fac: Peak gradient factor > - * @rnd_thresh: Rank Neighbor Difference threshold > - * @rg_fac: Rank gradient factor > + * @method: Method enable bits (RKISP1_CIF_ISP_DPCC_METHODS_SET_*) > + * @line_thresh: Line threshold (RKISP1_CIF_ISP_DPCC_LINE_THRESH_*) > + * @line_mad_fac: Line Mean Absolute Difference factor (RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_*) > + * @pg_fac: Peak gradient factor (RKISP1_CIF_ISP_DPCC_PG_FAC_*) > + * @rnd_thresh: Rank Neighbor Difference threshold (RKISP1_CIF_ISP_DPCC_RND_THRESH_*) > + * @rg_fac: Rank gradient factor (RKISP1_CIF_ISP_DPCC_RG_FAC_*) > */ > struct rkisp1_cif_isp_dpcc_methods_config { > __u32 method; > @@ -273,14 +316,16 @@ struct rkisp1_cif_isp_dpcc_methods_config { > /** > * struct rkisp1_cif_isp_dpcc_config - Configuration used by DPCC > * > - * Configuration used by Defect Pixel Cluster Correction > + * Configuration used by Defect Pixel Cluster Correction. Three sets of methods > + * can be configured and selected through the @set_use field. The result is the > + * logical OR of all enabled sets. > * > - * @mode: dpcc output mode > - * @output_mode: whether use hard coded methods > - * @set_use: stage1 methods set > - * @methods: methods config > - * @ro_limits: rank order limits > - * @rnd_offs: differential rank offsets for rank neighbor difference > + * @mode: DPCC mode (RKISP1_CIF_ISP_DPCC_MODE_*) > + * @output_mode: Interpolation output mode (RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_*) > + * @set_use: Methods sets selection (RKISP1_CIF_ISP_DPCC_SET_USE_*) > + * @methods: Methods sets configuration > + * @ro_limits: Rank order limits (RKISP1_CIF_ISP_DPCC_RO_LIMITS_*) > + * @rnd_offs: Differential rank offsets for rank neighbor difference (RKISP1_CIF_ISP_DPCC_RND_OFFS_*) > */ > struct rkisp1_cif_isp_dpcc_config { > __u32 mode; > -- > 2.34.1 >
Hi Florian, Thank you for the patch. On Wed, Jun 22, 2022 at 05:19:17PM +0200, Florian Sylvestre via libcamera-devel wrote: > To improve the kernel interface, a proposal has been made to the > linux-kernel [1] to improve the configuration of the Defective > Pixel Cluster Correction (DPCC). > > [1] > https://lore.kernel.org/linux-media/20220616160456.21549-1-laurent.pinchart@ideasonboard.com/ > > Update the local copy of the rkisp1-config.h to match the proposal. > > Signed-off-by: Florian Sylvestre <fsylvestre@baylibre.com> This looks good to me. Can I ask you to review the corresponding kernel patches ? :-) > --- > include/linux/rkisp1-config.h | 77 +++++++++++++++++++++++++++-------- > 1 file changed, 61 insertions(+), 16 deletions(-) > > diff --git a/include/linux/rkisp1-config.h b/include/linux/rkisp1-config.h > index 9be67d63..0ed3dca8 100644 > --- a/include/linux/rkisp1-config.h > +++ b/include/linux/rkisp1-config.h > @@ -117,7 +117,46 @@ > /* > * Defect Pixel Cluster Correction > */ > -#define RKISP1_CIF_ISP_DPCC_METHODS_MAX 3 > +#define RKISP1_CIF_ISP_DPCC_METHODS_MAX 3 > + > +#define RKISP1_CIF_ISP_DPCC_MODE_STAGE1_ENABLE (1U << 2) > + > +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_G_CENTER (1U << 0) > +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_RB_CENTER (1U << 1) > +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_G_3X3 (1U << 2) > +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_RB_3X3 (1U << 3) > + > +/* 0-2 for sets 1-3 */ > +#define RKISP1_CIF_ISP_DPCC_SET_USE_STAGE1_USE_SET(n) ((n) << 0) > +#define RKISP1_CIF_ISP_DPCC_SET_USE_STAGE1_USE_FIX_SET (1U << 3) > + > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_PG_GREEN_ENABLE (1U << 0) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_LC_GREEN_ENABLE (1U << 1) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RO_GREEN_ENABLE (1U << 2) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RND_GREEN_ENABLE (1U << 3) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RG_GREEN_ENABLE (1U << 4) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_PG_RED_BLUE_ENABLE (1U << 8) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_LC_RED_BLUE_ENABLE (1U << 9) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RO_RED_BLUE_ENABLE (1U << 10) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RND_RED_BLUE_ENABLE (1U << 11) > +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RG_RED_BLUE_ENABLE (1U << 12) > + > +#define RKISP1_CIF_ISP_DPCC_LINE_THRESH_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_LINE_THRESH_RB(v) ((v) << 8) > +#define RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_RB(v) ((v) << 8) > +#define RKISP1_CIF_ISP_DPCC_PG_FAC_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_PG_FAC_RB(v) ((v) << 8) > +#define RKISP1_CIF_ISP_DPCC_RND_THRESH_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_RND_THRESH_RB(v) ((v) << 8) > +#define RKISP1_CIF_ISP_DPCC_RG_FAC_G(v) ((v) << 0) > +#define RKISP1_CIF_ISP_DPCC_RG_FAC_RB(v) ((v) << 8) > + > +#define RKISP1_CIF_ISP_DPCC_RO_LIMITS_n_G(n, v) ((v) << ((n) * 4)) > +#define RKISP1_CIF_ISP_DPCC_RO_LIMITS_n_RB(n, v) ((v) << ((n) * 4 + 2)) > + > +#define RKISP1_CIF_ISP_DPCC_RND_OFFS_n_G(n, v) ((v) << ((n) * 4)) > +#define RKISP1_CIF_ISP_DPCC_RND_OFFS_n_RB(n, v) ((v) << ((n) * 4 + 2)) > > /* > * Denoising pre filter > @@ -250,16 +289,20 @@ struct rkisp1_cif_isp_bls_config { > }; > > /** > - * struct rkisp1_cif_isp_dpcc_methods_config - Methods Configuration used by DPCC > + * struct rkisp1_cif_isp_dpcc_methods_config - DPCC methods set configuration > * > - * Methods Configuration used by Defect Pixel Cluster Correction > + * This structure stores the configuration of one set of methods for the DPCC > + * algorithm. Multiple methods can be selected in each set (independently for > + * the Green and Red/Blue components) through the @method field, the result is > + * the logical AND of all enabled methods. The remaining fields set thresholds > + * and factors for each method. > * > - * @method: Method enable bits > - * @line_thresh: Line threshold > - * @line_mad_fac: Line MAD factor > - * @pg_fac: Peak gradient factor > - * @rnd_thresh: Rank Neighbor Difference threshold > - * @rg_fac: Rank gradient factor > + * @method: Method enable bits (RKISP1_CIF_ISP_DPCC_METHODS_SET_*) > + * @line_thresh: Line threshold (RKISP1_CIF_ISP_DPCC_LINE_THRESH_*) > + * @line_mad_fac: Line Mean Absolute Difference factor (RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_*) > + * @pg_fac: Peak gradient factor (RKISP1_CIF_ISP_DPCC_PG_FAC_*) > + * @rnd_thresh: Rank Neighbor Difference threshold (RKISP1_CIF_ISP_DPCC_RND_THRESH_*) > + * @rg_fac: Rank gradient factor (RKISP1_CIF_ISP_DPCC_RG_FAC_*) > */ > struct rkisp1_cif_isp_dpcc_methods_config { > __u32 method; > @@ -273,14 +316,16 @@ struct rkisp1_cif_isp_dpcc_methods_config { > /** > * struct rkisp1_cif_isp_dpcc_config - Configuration used by DPCC > * > - * Configuration used by Defect Pixel Cluster Correction > + * Configuration used by Defect Pixel Cluster Correction. Three sets of methods > + * can be configured and selected through the @set_use field. The result is the > + * logical OR of all enabled sets. > * > - * @mode: dpcc output mode > - * @output_mode: whether use hard coded methods > - * @set_use: stage1 methods set > - * @methods: methods config > - * @ro_limits: rank order limits > - * @rnd_offs: differential rank offsets for rank neighbor difference > + * @mode: DPCC mode (RKISP1_CIF_ISP_DPCC_MODE_*) > + * @output_mode: Interpolation output mode (RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_*) > + * @set_use: Methods sets selection (RKISP1_CIF_ISP_DPCC_SET_USE_*) > + * @methods: Methods sets configuration > + * @ro_limits: Rank order limits (RKISP1_CIF_ISP_DPCC_RO_LIMITS_*) > + * @rnd_offs: Differential rank offsets for rank neighbor difference (RKISP1_CIF_ISP_DPCC_RND_OFFS_*) > */ > struct rkisp1_cif_isp_dpcc_config { > __u32 mode;
diff --git a/include/linux/rkisp1-config.h b/include/linux/rkisp1-config.h index 9be67d63..0ed3dca8 100644 --- a/include/linux/rkisp1-config.h +++ b/include/linux/rkisp1-config.h @@ -117,7 +117,46 @@ /* * Defect Pixel Cluster Correction */ -#define RKISP1_CIF_ISP_DPCC_METHODS_MAX 3 +#define RKISP1_CIF_ISP_DPCC_METHODS_MAX 3 + +#define RKISP1_CIF_ISP_DPCC_MODE_STAGE1_ENABLE (1U << 2) + +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_G_CENTER (1U << 0) +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_INCL_RB_CENTER (1U << 1) +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_G_3X3 (1U << 2) +#define RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_STAGE1_RB_3X3 (1U << 3) + +/* 0-2 for sets 1-3 */ +#define RKISP1_CIF_ISP_DPCC_SET_USE_STAGE1_USE_SET(n) ((n) << 0) +#define RKISP1_CIF_ISP_DPCC_SET_USE_STAGE1_USE_FIX_SET (1U << 3) + +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_PG_GREEN_ENABLE (1U << 0) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_LC_GREEN_ENABLE (1U << 1) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RO_GREEN_ENABLE (1U << 2) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RND_GREEN_ENABLE (1U << 3) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RG_GREEN_ENABLE (1U << 4) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_PG_RED_BLUE_ENABLE (1U << 8) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_LC_RED_BLUE_ENABLE (1U << 9) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RO_RED_BLUE_ENABLE (1U << 10) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RND_RED_BLUE_ENABLE (1U << 11) +#define RKISP1_CIF_ISP_DPCC_METHODS_SET_RG_RED_BLUE_ENABLE (1U << 12) + +#define RKISP1_CIF_ISP_DPCC_LINE_THRESH_G(v) ((v) << 0) +#define RKISP1_CIF_ISP_DPCC_LINE_THRESH_RB(v) ((v) << 8) +#define RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_G(v) ((v) << 0) +#define RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_RB(v) ((v) << 8) +#define RKISP1_CIF_ISP_DPCC_PG_FAC_G(v) ((v) << 0) +#define RKISP1_CIF_ISP_DPCC_PG_FAC_RB(v) ((v) << 8) +#define RKISP1_CIF_ISP_DPCC_RND_THRESH_G(v) ((v) << 0) +#define RKISP1_CIF_ISP_DPCC_RND_THRESH_RB(v) ((v) << 8) +#define RKISP1_CIF_ISP_DPCC_RG_FAC_G(v) ((v) << 0) +#define RKISP1_CIF_ISP_DPCC_RG_FAC_RB(v) ((v) << 8) + +#define RKISP1_CIF_ISP_DPCC_RO_LIMITS_n_G(n, v) ((v) << ((n) * 4)) +#define RKISP1_CIF_ISP_DPCC_RO_LIMITS_n_RB(n, v) ((v) << ((n) * 4 + 2)) + +#define RKISP1_CIF_ISP_DPCC_RND_OFFS_n_G(n, v) ((v) << ((n) * 4)) +#define RKISP1_CIF_ISP_DPCC_RND_OFFS_n_RB(n, v) ((v) << ((n) * 4 + 2)) /* * Denoising pre filter @@ -250,16 +289,20 @@ struct rkisp1_cif_isp_bls_config { }; /** - * struct rkisp1_cif_isp_dpcc_methods_config - Methods Configuration used by DPCC + * struct rkisp1_cif_isp_dpcc_methods_config - DPCC methods set configuration * - * Methods Configuration used by Defect Pixel Cluster Correction + * This structure stores the configuration of one set of methods for the DPCC + * algorithm. Multiple methods can be selected in each set (independently for + * the Green and Red/Blue components) through the @method field, the result is + * the logical AND of all enabled methods. The remaining fields set thresholds + * and factors for each method. * - * @method: Method enable bits - * @line_thresh: Line threshold - * @line_mad_fac: Line MAD factor - * @pg_fac: Peak gradient factor - * @rnd_thresh: Rank Neighbor Difference threshold - * @rg_fac: Rank gradient factor + * @method: Method enable bits (RKISP1_CIF_ISP_DPCC_METHODS_SET_*) + * @line_thresh: Line threshold (RKISP1_CIF_ISP_DPCC_LINE_THRESH_*) + * @line_mad_fac: Line Mean Absolute Difference factor (RKISP1_CIF_ISP_DPCC_LINE_MAD_FAC_*) + * @pg_fac: Peak gradient factor (RKISP1_CIF_ISP_DPCC_PG_FAC_*) + * @rnd_thresh: Rank Neighbor Difference threshold (RKISP1_CIF_ISP_DPCC_RND_THRESH_*) + * @rg_fac: Rank gradient factor (RKISP1_CIF_ISP_DPCC_RG_FAC_*) */ struct rkisp1_cif_isp_dpcc_methods_config { __u32 method; @@ -273,14 +316,16 @@ struct rkisp1_cif_isp_dpcc_methods_config { /** * struct rkisp1_cif_isp_dpcc_config - Configuration used by DPCC * - * Configuration used by Defect Pixel Cluster Correction + * Configuration used by Defect Pixel Cluster Correction. Three sets of methods + * can be configured and selected through the @set_use field. The result is the + * logical OR of all enabled sets. * - * @mode: dpcc output mode - * @output_mode: whether use hard coded methods - * @set_use: stage1 methods set - * @methods: methods config - * @ro_limits: rank order limits - * @rnd_offs: differential rank offsets for rank neighbor difference + * @mode: DPCC mode (RKISP1_CIF_ISP_DPCC_MODE_*) + * @output_mode: Interpolation output mode (RKISP1_CIF_ISP_DPCC_OUTPUT_MODE_*) + * @set_use: Methods sets selection (RKISP1_CIF_ISP_DPCC_SET_USE_*) + * @methods: Methods sets configuration + * @ro_limits: Rank order limits (RKISP1_CIF_ISP_DPCC_RO_LIMITS_*) + * @rnd_offs: Differential rank offsets for rank neighbor difference (RKISP1_CIF_ISP_DPCC_RND_OFFS_*) */ struct rkisp1_cif_isp_dpcc_config { __u32 mode;
To improve the kernel interface, a proposal has been made to the linux-kernel [1] to improve the configuration of the Defective Pixel Cluster Correction (DPCC). [1] https://lore.kernel.org/linux-media/20220616160456.21549-1-laurent.pinchart@ideasonboard.com/ Update the local copy of the rkisp1-config.h to match the proposal. Signed-off-by: Florian Sylvestre <fsylvestre@baylibre.com> --- include/linux/rkisp1-config.h | 77 +++++++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 16 deletions(-)