Fix the rkisp1 userspace API for later IP versions
Subsystems (3)
Heiko Stuebner
maintainerv5 cover Fix the rkisp1 userspace API for later IP versions
This NEEDs to go into 5.11 while we can still adapt the uapi during its RC-cycle.
When looking into supporting the rkisp1 of the px30 I noticed that some fields got bigger in the uapi, caused by bigger number of samples for example for histograms or gamma values.
The rkisp1 was destaged with 5.11-rc1 so we have still time during the 5.11 cycle to fix that without big hassles.
This was discussed previously in a mail [0] and a rfc series [1] and this two-part series now splits out the important parts that really should become part of a 5.11-rc and thus the final 5.11.
changes since v4:
- set GAMMA_OUT to the real 25 instead of the 28 with 3 spares (Dafna)
- start RKISP_Vxx enum with 10 for RKISP_V10 to make output easier and also allow userspace to differentiate between old (= 0) and newer driver variants (Dafna, Laurent)
changes since v3:
- add patch fixing the original histogram size comment
- make comments in uapi more verbose (Hans)
- fix wording in admin guide (Hans)
- document version <-> soc in uapi as well (easier for people) (Dafna)
changes since v2:
- actually zero the correct sizes for u16 values (hist-bins) (kernel-test-robot)
changes since v1:
- drop duplicate isp_ver storage, hw_revision is enough (Dafna)
- document multiple maximum sizes in uapi (Hans)
- document usage of hw_revision field (Hans)
- zero fields transmitted to userspace before adding data (Hans)
- use _V10 field sizes when filling fields, as there is only v10 for now
changes since rfc:
- move rkisp1_version enum into uapo
- show version in media-api hw_revision
- introduce constants for versions and make max use the biggest
Heiko Stuebner (3):
media: rockchip: rkisp1: fix comment about number of histogram
sub-windows
media: rockchip: rkisp1: carry ip version information
media: rockchip: rkisp1: extend uapi array sizes
Documentation/admin-guide/media/rkisp1.rst | 16 ++++ .../platform/rockchip/rkisp1/rkisp1-dev.c | 21 +++--- .../platform/rockchip/rkisp1/rkisp1-params.c | 2 +- .../platform/rockchip/rkisp1/rkisp1-stats.c | 12 ++- include/uapi/linux/rkisp1-config.h | 74 +++++++++++++++++-- 5 files changed, 106 insertions(+), 19 deletions(-)
Signature · 7 lines
2.29.2 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stuebner
maintainerPATCH v5 1/3 media: rockchip: rkisp1: fix comment about number of histogram sub-windows
From: Heiko Stuebner <[email protected]>
The histogram data is divided into 16 sub-windows, not 25. See RKISP1_CIF_ISP_HIST_BIN_N_MAX being defined as 16 for reference and this also matches the datasheet.
--- include/uapi/linux/rkisp1-config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/rkisp1-config.h +1 -1
@@ -846,7 +846,7 @@ struct rkisp1_cif_isp_af_stat {* * @hist_bins: measured bin counters * -* Measurement window divided into 25 sub-windows, set +* Measurement window divided into 16 sub-windows, set * with ISP_HIST_XXX */ struct rkisp1_cif_isp_hist_stat {
Signature · 7 lines
2.29.2 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stuebner
maintainerPATCH v5 2/3 media: rockchip: rkisp1: carry ip version information
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The IP block evolved from its rk3288/rk3399 base and the vendor designates them with a numerical version. rk3399 for example is designated V10 probably meaning V1.0.
There doesn't seem to be an actual version register we could read that information from, so allow the match_data to carry that information for future differentiation.
Also carry that information in the hw_revision field of the media- controller API, so that userspace also has access to that.
The added versions are:
- V10: at least rk3288 + rk3399
- V11: seemingly unused as of now, but probably appeared in some soc
- V12: at least rk3326 + px30
- V13: at least rk1808
--- Documentation/admin-guide/media/rkisp1.rst | 16 ++++++++++++++ .../platform/rockchip/rkisp1/rkisp1-dev.c | 21 +++++++++++-------- include/uapi/linux/rkisp1-config.h | 16 ++++++++++++++ 3 files changed, 44 insertions(+), 9 deletions(-)
Documentation/admin-guide/media/rkisp1.rst +16 -0
@@ -13,6 +13,22 @@ This file documents the driver for the Rockchip ISP1 that is part of RK3288 and RK3399 SoCs. The driver is located under drivers/staging/media/rkisp1 and uses the Media-Controller API. +Revisions +========= + +There exist multiple smaller revisions to this ISP that got introduced in +later SoCs. Revisions can be found in the enum :c:type:`rkisp1_cif_isp_version` +in the UAPI and the revision of the ISP inside the running SoC can be read +in the field hw_revision of struct media_device_info as returned by +ioctl MEDIA_IOC_DEVICE_INFO. + +Versions in use are: + +- RKISP1_V10: used at least in rk3288 and rk3399 +- RKISP1_V11: declared in the original vendor code, but not used +- RKISP1_V12: used at least in rk3326 and px30 +- RKISP1_V13: used at least in rk1808 + Topology ======== .. _rkisp1_topology_graph:
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +12 -9
@@ -104,6 +104,7 @@struct rkisp1_match_data {const char *const *clks;unsigned int size; +enum rkisp1_cif_isp_version isp_ver; };/* ----------------------------------------------------------------------------
@@ -411,15 +412,16 @@ static const char * const rk3399_isp_clks[] = { "hclk", }; -static const struct rkisp1_match_data rk3399_isp_clk_data = { +static const struct rkisp1_match_data rk3399_isp_match_data = { .clks = rk3399_isp_clks, .size =ARRAY_SIZE (rk3399_isp_clks), + .isp_ver =RKISP1_V10 , };static const struct of_device_id rkisp1_of_match[] = { { .compatible ="rockchip,rk3399-cif-isp" , - .data = &rk3399_isp_clk_data, + .data = &rk3399_isp_match_data, }, {}, };
@@ -457,15 +459,15 @@ static void rkisp1_debug_init(struct rkisp1_device *rkisp1)static int rkisp1_probe (struct platform_device *pdev) { -const struct rkisp1_match_data *clk_data; +const struct rkisp1_match_data *match_data;struct device *dev = &pdev->dev;struct rkisp1_device *rkisp1;struct v4l2_device *v4l2_dev;unsigned int i;int ret, irq; - clk_data =of_device_get_match_data (&pdev->dev); -if (!clk_data) + match_data =of_device_get_match_data (&pdev->dev); +if (!match_data)return -ENODEV ; rkisp1 =devm_kzalloc (dev,sizeof (*rkisp1),GFP_KERNEL );
@@ -494,15 +496,16 @@ static int rkisp1_probe(struct platform_device *pdev) rkisp1->irq = irq; -for (i =0 ; i < clk_data->size; i++) - rkisp1->clks[i].id = clk_data->clks[i]; - ret =devm_clk_bulk_get (dev, clk_data->size, rkisp1->clks); +for (i =0 ; i < match_data->size; i++) + rkisp1->clks[i].id = match_data->clks[i]; + ret =devm_clk_bulk_get (dev, match_data->size, rkisp1->clks);if (ret)return ret; - rkisp1->clk_size = clk_data->size; + rkisp1->clk_size = match_data->size;pm_runtime_enable (&pdev->dev); + rkisp1->media_dev.hw_revision = match_data->isp_ver;strscpy (rkisp1->media_dev.model,RKISP1_DRIVER_NAME ,sizeof (rkisp1->media_dev.model)); rkisp1->media_dev.dev = &pdev->dev;
include/uapi/linux/rkisp1-config.h +16 -0
@@ -124,6 +124,22 @@#define RKISP1_CIF_ISP_STAT_AFM (1U << 2)#define RKISP1_CIF_ISP_STAT_HIST (1U << 3) + +/** +* enum rkisp1_cif_isp_version - ISP variants +* +* @RKISP1_V10: used at least in rk3288 and rk3399 +* @RKISP1_V11: declared in the original vendor code, but not used +* @RKISP1_V12: used at least in rk3326 and px30 +* @RKISP1_V13: used at least in rk1808 +*/ +enum rkisp1_cif_isp_version { +RKISP1_V10 =10 , +RKISP1_V11 , +RKISP1_V12 , +RKISP1_V13 , +}; +enum rkisp1_cif_isp_histogram_mode {RKISP1_CIF_ISP_HISTOGRAM_MODE_DISABLE ,RKISP1_CIF_ISP_HISTOGRAM_MODE_RGB_COMBINED ,
Signature · 7 lines
2.29.2 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stuebner
maintainerPATCH v5 3/3 media: rockchip: rkisp1: extend uapi array sizes
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
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.
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.
--- .../platform/rockchip/rkisp1/rkisp1-params.c | 2 +- .../platform/rockchip/rkisp1/rkisp1-stats.c | 12 +++- include/uapi/linux/rkisp1-config.h | 58 ++++++++++++++++--- 3 files changed, 62 insertions(+), 10 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +1 -1
@@ -391,7 +391,7 @@ static void rkisp1_goc_config(struct rkisp1_params *params, RKISP1_CIF_ISP_CTRL_ISP_GAMMA_OUT_ENA);rkisp1_write (params->rkisp1, arg->mode,RKISP1_CIF_ISP_GAMMA_OUT_MODE ); -for (i =0 ; i <RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES ; i++) +for (i =0 ; i <RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10 ; i++)rkisp1_write (params->rkisp1, arg->gamma_y[i],RKISP1_CIF_ISP_GAMMA_OUT_Y_0 + i *4 ); }
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +10 -2
@@ -202,8 +202,12 @@ static void rkisp1_stats_get_aec_meas(struct rkisp1_stats *stats,struct rkisp1_device *rkisp1 = stats->rkisp1;unsigned int i; +/* the global max can be bigger than the version-specific one */ +memset (pbuf->params.ae.exp_mean,0 ,RKISP1_CIF_ISP_AE_MEAN_MAX * +sizeof (*pbuf->params.ae.exp_mean)); + pbuf->meas_type |=RKISP1_CIF_ISP_STAT_AUTOEXP ; -for (i =0 ; i <RKISP1_CIF_ISP_AE_MEAN_MAX ; i++) +for (i =0 ; i <RKISP1_CIF_ISP_AE_MEAN_MAX_V10 ; i++) pbuf->params.ae.exp_mean[i] = (u8 )rkisp1_read (rkisp1,RKISP1_CIF_ISP_EXP_MEAN_00 + i *4 );
@@ -232,8 +236,12 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats,struct rkisp1_device *rkisp1 = stats->rkisp1;unsigned int i; +/* the global max can be bigger then the version-specific one */ +memset (pbuf->params.hist.hist_bins,0 ,RKISP1_CIF_ISP_HIST_BIN_N_MAX * +sizeof (*pbuf->params.hist.hist_bins)); + pbuf->meas_type |=RKISP1_CIF_ISP_STAT_HIST ; -for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX ; i++) +for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 ; i++) pbuf->params.hist.hist_bins[i] = (u8 )rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 );
include/uapi/linux/rkisp1-config.h +51 -7
100 lines not on this page · raw message
Signature · 7 lines
2.29.2 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v5 3/3] media: rockchip: rkisp1: extend uapi array sizes
Hi Heiko,
Quoted 8 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
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_SIZE28 -> 81
This still mentions 28.
The commit message must say something about changing 28 to 25 as well.
Actually, I think it would be best if that change (28 -> 25) is done in a separate 2/4 patch since this is independent of the V12/13 support.
Otherwise this series looks good from my point of view.
Regards,
Hans
Quoted 167 lines
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.
Signed-off-by Heiko Stuebner <[email protected]>Reviewed-by Ezequiel Garcia <[email protected]>Reviewed-by Dafna Hirschfeld <[email protected]>--- .../platform/rockchip/rkisp1/rkisp1-params.c | 2 +- .../platform/rockchip/rkisp1/rkisp1-stats.c | 12 +++- include/uapi/linux/rkisp1-config.h | 58 ++++++++++++++++--- 3 files changed, 62 insertions(+), 10 deletions(-)drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +1
-1@@ -391,7 +391,7 @@ static void rkisp1_goc_config(struct rkisp1_params *params, RKISP1_CIF_ISP_CTRL_ISP_GAMMA_OUT_ENA);rkisp1_write (params->rkisp1, arg->mode,RKISP1_CIF_ISP_GAMMA_OUT_MODE ); -for (i =0 ; i <RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES ; i++) +for (i =0 ; i <RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10 ; i++)rkisp1_write (params->rkisp1, arg->gamma_y[i],RKISP1_CIF_ISP_GAMMA_OUT_Y_0 + i *4 ); }drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +10
-2@@ -202,8 +202,12 @@ static void rkisp1_stats_get_aec_meas(struct rkisp1_stats *stats,struct rkisp1_device *rkisp1 = stats->rkisp1;unsigned int i; +/* the global max can be bigger than the version-specific one */ +memset (pbuf->params.ae.exp_mean,0 ,RKISP1_CIF_ISP_AE_MEAN_MAX * +sizeof (*pbuf->params.ae.exp_mean)); + pbuf->meas_type |=RKISP1_CIF_ISP_STAT_AUTOEXP ; -for (i =0 ; i <RKISP1_CIF_ISP_AE_MEAN_MAX ; i++) +for (i =0 ; i <RKISP1_CIF_ISP_AE_MEAN_MAX_V10 ; i++) pbuf->params.ae.exp_mean[i] = (u8 )rkisp1_read (rkisp1,RKISP1_CIF_ISP_EXP_MEAN_00 + i *4 );@@ -232,8 +236,12 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats,struct rkisp1_device *rkisp1 = stats->rkisp1;unsigned int i; +/* the global max can be bigger then the version-specific one */ +memset (pbuf->params.hist.hist_bins,0 ,RKISP1_CIF_ISP_HIST_BIN_N_MAX * +sizeof (*pbuf->params.hist.hist_bins)); + pbuf->meas_type |=RKISP1_CIF_ISP_STAT_HIST ; -for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX ; i++) +for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 ; i++) pbuf->params.hist.hist_bins[i] = (u8 )rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 );include/uapi/linux/rkisp1-config.h +44
-7@@ -49,8 +49,14 @@#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_V10 25 +#define RKISP1_CIF_ISP_AE_MEAN_MAX_V12 81 +#define RKISP1_CIF_ISP_AE_MEAN_MAX RKISP1_CIF_ISP_AE_MEAN_MAX_V12 + +#define RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 16 +#define RKISP1_CIF_ISP_HIST_BIN_N_MAX_V12 32 +#define RKISP1_CIF_ISP_HIST_BIN_N_MAX RKISP1_CIF_ISP_HIST_BIN_N_MAX_V12 +#define RKISP1_CIF_ISP_AFM_MAX_WINDOWS 3#define RKISP1_CIF_ISP_DEGAMMA_CURVE_SIZE 17@@ -86,7 +92,9 @@* 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_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/* * Lens shade correction @@ -103,7 +111,9 @@* Histogram calculation */ /* Last 3 values unused. */ -#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 28 +#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V10 25 +#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V12 81 +#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V12/* * Defect Pixel Cluster Correction @@ -526,6 +536,15 @@ enum rkisp1_cif_isp_goc_mode {* * @mode: goc mode (from enum rkisp1_cif_isp_goc_mode) * @gamma_y: gamma out curve y-axis for all color components +* +* The number of entries of @gamma_y depends on the hardware revision +* as is reported by the hw_revision field of the struct media_device_info +* that is returned by ioctl MEDIA_IOC_DEVICE_INFO. +* +* Versions <= V11 have RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10 +* entries, versions >= V12 have RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V12 +* entries. RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES is equal to the maximum +* of the two. */ struct rkisp1_cif_isp_goc_config {__u32 mode;@@ -540,6 +559,15 @@ struct rkisp1_cif_isp_goc_config {* skipped * @meas_window: coordinates of the measure window * @hist_weight: weighting factor for sub-windows +* +* The number of entries of @hist_weight depends on the hardware revision +* as is reported by the hw_revision field of the struct media_device_info +* that is returned by ioctl MEDIA_IOC_DEVICE_INFO. +* +* Versions <= V11 have RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V10 +* entries, versions >= V12 have RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V12 +* entries. RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE is equal to the maximum +* of the two. */ struct rkisp1_cif_isp_hst_config {__u32 mode;@@ -827,7 +855,15 @@ struct rkisp1_cif_isp_bls_meas_val {* @exp_mean: Mean luminance value of block xx * @bls_val: BLS measured values * -* Image is divided into 5x5 blocks. +* The number of entries of @exp_mean depends on the hardware revision +* as is reported by the hw_revision field of the struct media_device_info +* that is returned by ioctl MEDIA_IOC_DEVICE_INFO. +* +* Versions <= V11 have RKISP1_CIF_ISP_AE_MEAN_MAX_V10 entries, +* versions >= V12 have RKISP1_CIF_ISP_AE_MEAN_MAX_V12 entries. +* RKISP1_CIF_ISP_AE_MEAN_MAX is equal to the maximum of the two. +* +* Image is divided into 5x5 blocks on V10 and 9x9 blocks on V12. */ struct rkisp1_cif_isp_ae_stat {__u8 exp_mean[RKISP1_CIF_ISP_AE_MEAN_MAX ];@@ -862,8 +898,16 @@ struct rkisp1_cif_isp_af_stat {* * @hist_bins: measured bin counters * -* Measurement window divided into 16 sub-windows, set -* with ISP_HIST_XXX +* The histogram values divided into 16 bins for V10/V11 and 32 bins +* for V12/V13. It is configured within the struct rkisp1_cif_isp_hst_config. +*
include/uapi/linux/rkisp1-config.h struct rkisp1_cif_isp_af_stat { · line 913
Quoted 10 lines
include/uapi/linux/rkisp1-config.h +7
-0+* The number of entries of @hist_bins depends on the hardware revision +* as is reported by the hw_revision field of the struct media_device_info +* that is returned by ioctl MEDIA_IOC_DEVICE_INFO. +* +* Versions <= V11 have RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 entries, +* versions >= V12 have RKISP1_CIF_ISP_HIST_BIN_N_MAX_V12 entries. +* RKISP1_CIF_ISP_HIST_BIN_N_MAX is equal to the maximum of the two. */ struct rkisp1_cif_isp_hist_stat {__u16 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ];
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip