Thread (24 messages) 24 messages, 3 authors, 2021-02-08

Re: [PATCH RFC 05/11] media: rockchip: rkisp1: extend uapi array sizes

From: Dafna Hirschfeld <hidden>
Date: 2021-01-09 20:13:17
Also in: linux-rockchip


Am 08.01.21 um 20:33 schrieb Heiko Stuebner:
quoted hunk ↗ jump to hunk
From: Heiko Stuebner <redacted>

Later variants of the rkisp1 block use more entries in some arrays:

RKISP1_CIF_ISP_AE_MEAN_MAX                 25 -> 81
RKISP1_CIF_ISP_HIST_BIN_N_MAX              16 -> 32
RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES       17 -> 34
RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 28 -> 81

and we can still extend the uapi during the 5.11-rc cycle, so do that
now to be on the safe side.

Signed-off-by: Heiko Stuebner <redacted>
---
  include/uapi/linux/rkisp1-config.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linux/rkisp1-config.h
index 6e449e784260..31a88bb65e03 100644
--- a/include/uapi/linux/rkisp1-config.h
+++ b/include/uapi/linux/rkisp1-config.h
@@ -49,8 +49,8 @@
  #define RKISP1_CIF_ISP_CTK_COEFF_MAX            0x100
  #define RKISP1_CIF_ISP_CTK_OFFSET_MAX           0x800
  
-#define RKISP1_CIF_ISP_AE_MEAN_MAX              25
-#define RKISP1_CIF_ISP_HIST_BIN_N_MAX           16
+#define RKISP1_CIF_ISP_AE_MEAN_MAX              81
+#define RKISP1_CIF_ISP_HIST_BIN_N_MAX           32
  #define RKISP1_CIF_ISP_AFM_MAX_WINDOWS          3
  #define RKISP1_CIF_ISP_DEGAMMA_CURVE_SIZE       17
  
@@ -86,7 +86,7 @@
   * Gamma out
   */
  /* Maximum number of color samples supported */
-#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES       17
+#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES       34
  
  /*
   * Lens shade correction
@@ -103,7 +103,7 @@
   * Histogram calculation
   */
  /* Last 3 values unused. */
-#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 28
+#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 81
  
Hi,
We should have 3 defines for each of the changes,
to keep the values per version and then set the
array size to be the bigger of the two.
For example:


#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10       17
#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_v12       34
#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES       RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V12

Thanks,
Dafna
  /*
   * Defect Pixel Cluster Correction
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help