History

media: rockchip: rkisp1: extend uapi array sizes

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 25 -> 81 and we can still extend the uapi during the 5.11-rc cycle, so do that now to be on the safe side. V10 and V11 only need the smaller sizes, while V12 and V13 needed the larger sizes. When adding the bigger sizes make sure, values filled from hardware values and transmitted to userspace don't leak kernel data by zeroing them beforehand.

Heiko Stuebner committed 5 years ago

Commit ef357e01 parent fc672d83 files · +60 −13Browse files

Showing the changes to include/uapi/linux (1 of 3 files). Show all

Unified · Split

include/uapi/linux/rkisp1-config.h+57−10
@@ -49,8 +49,14 @@ · 48 unmodified lines
4949 #define RKISP1_CIF_ISP_CTK_COEFF_MAX 0x100
5050 #define RKISP1_CIF_ISP_CTK_OFFSET_MAX 0x800
5151
52−#define RKISP1_CIF_ISP_AE_MEAN_MAX 25
53−#define RKISP1_CIF_ISP_HIST_BIN_N_MAX 16
52+#define RKISP1_CIF_ISP_AE_MEAN_MAX_V10 25
53+#define RKISP1_CIF_ISP_AE_MEAN_MAX_V12 81
54+#define RKISP1_CIF_ISP_AE_MEAN_MAX RKISP1_CIF_ISP_AE_MEAN_MAX_V12
55+
56+#define RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 16
57+#define RKISP1_CIF_ISP_HIST_BIN_N_MAX_V12 32
58+#define RKISP1_CIF_ISP_HIST_BIN_N_MAX RKISP1_CIF_ISP_HIST_BIN_N_MAX_V12
59+
5460 #define RKISP1_CIF_ISP_AFM_MAX_WINDOWS 3
5561 #define RKISP1_CIF_ISP_DEGAMMA_CURVE_SIZE 17
5662
@@ -86,7 +92,9 @@ · 29 unmodified lines
8692 * Gamma out
8793 */
8894 /* Maximum number of color samples supported */
89−#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES 17
95+#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10 17
96+#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V12 34
97+#define RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V12
9098
9199 /*
92100 * Lens shade correction
@@ -102,7 +110,9 @@ · 9 unmodified lines
102110 /*
103111 * Histogram calculation
104112 */
105−#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 25
113+#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V10 25
114+#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V12 81
115+#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V12
106116
107117 /*
108118 * Defect Pixel Cluster Correction
@@ -524,6 +534,15 @@ enum rkisp1_cif_isp_goc_mode { · 415 unmodified lines
524534 *
525535 * @mode: goc mode (from enum rkisp1_cif_isp_goc_mode)
526536 * @gamma_y: gamma out curve y-axis for all color components
537+ *
538+ * The number of entries of @gamma_y depends on the hardware revision
539+ * as is reported by the hw_revision field of the struct media_device_info
540+ * that is returned by ioctl MEDIA_IOC_DEVICE_INFO.
541+ *
542+ * Versions <= V11 have RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10
543+ * entries, versions >= V12 have RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V12
544+ * entries. RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES is equal to the maximum
545+ * of the two.
527546 */
528547 struct rkisp1_cif_isp_goc_config {
529548 __u32 mode;
@@ -538,6 +557,15 @@ struct rkisp1_cif_isp_goc_config { · 8 unmodified lines
538557 * skipped
539558 * @meas_window: coordinates of the measure window
540559 * @hist_weight: weighting factor for sub-windows
560+ *
561+ * The number of entries of @hist_weight depends on the hardware revision
562+ * as is reported by the hw_revision field of the struct media_device_info
563+ * that is returned by ioctl MEDIA_IOC_DEVICE_INFO.
564+ *
565+ * Versions <= V11 have RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V10
566+ * entries, versions >= V12 have RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V12
567+ * entries. RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE is equal to the maximum
568+ * of the two.
541569 */
542570 struct rkisp1_cif_isp_hst_config {
543571 __u32 mode;
@@ -825,7 +853,15 @@ struct rkisp1_cif_isp_bls_meas_val { · 281 unmodified lines
825853 * @exp_mean: Mean luminance value of block xx
826854 * @bls_val: BLS measured values
827855 *
828− * Image is divided into 5x5 blocks.
856+ * The number of entries of @exp_mean depends on the hardware revision
857+ * as is reported by the hw_revision field of the struct media_device_info
858+ * that is returned by ioctl MEDIA_IOC_DEVICE_INFO.
859+ *
860+ * Versions <= V11 have RKISP1_CIF_ISP_AE_MEAN_MAX_V10 entries,
861+ * versions >= V12 have RKISP1_CIF_ISP_AE_MEAN_MAX_V12 entries.
862+ * RKISP1_CIF_ISP_AE_MEAN_MAX is equal to the maximum of the two.
863+ *
864+ * Image is divided into 5x5 blocks on V10 and 9x9 blocks on V12.
829865 */
830866 struct rkisp1_cif_isp_ae_stat {
831867 __u8 exp_mean[RKISP1_CIF_ISP_AE_MEAN_MAX];
@@ -862,11 +898,22 @@ struct rkisp1_cif_isp_af_stat { · 30 unmodified lines
862898 * type. Bits 0-4 are the fractional part and bits 5-19 are the
863899 * integer part.
864900 *
865− * The window of the measurements area is divided to 5x5 sub-windows. The
866− * histogram is then computed for each sub-window independently and the final
867− * result is a weighted average of the histogram measurements on all
868− * sub-windows. The window of the measurements area and the weight of each
869− * sub-window are configurable using struct @rkisp1_cif_isp_hst_config.
901+ * The window of the measurements area is divided to 5x5 sub-windows for
902+ * V10/V11 and to 9x9 sub-windows for V12. The histogram is then computed for
903+ * each sub-window independently and the final result is a weighted average of
904+ * the histogram measurements on all sub-windows. The window of the
905+ * measurements area and the weight of each sub-window are configurable using
906+ * struct @rkisp1_cif_isp_hst_config.
907+ *
908+ * The histogram contains 16 bins in V10/V11 and 32 bins in V12/V13.
909+ *
910+ * The number of entries of @hist_bins depends on the hardware revision
911+ * as is reported by the hw_revision field of the struct media_device_info
912+ * that is returned by ioctl MEDIA_IOC_DEVICE_INFO.
913+ *
914+ * Versions <= V11 have RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 entries,
915+ * versions >= V12 have RKISP1_CIF_ISP_HIST_BIN_N_MAX_V12 entries.
916+ * RKISP1_CIF_ISP_HIST_BIN_N_MAX is equal to the maximum of the two.
870917 */
871918 struct rkisp1_cif_isp_hist_stat {
872919 __u32 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX];