Fix the rkisp1 userspace API for later IP versions
Subsystems (3)
v7 cover Fix the rkisp1 userspace API for later IP versions
Hi,
This is v7 of the rkisp1 fixes set sent by Heiko Stuebner. [0]
In addition to prepare the support to px30 (V12 in the uapi) This version of the set adds more fixes to the code in params/stats according to the changes in the uapi and also change the hist_bins to be u32 instead of u16.
More details about the patchset can be found in v6's cover-letter [1]
[0] https://patchwork.kernel.org/project/linux-media/list/?series=416647
[1] https://patchwork.kernel.org/project/linux-media/cover/[email protected]/
changes since v6:
- add a patch to change the hist_bins array type to __u32 and extend the documentation of how the histogram measurements are taken
- remove a wrong u8 cast when filling the hist_bins array
- when reducing the number of elements in the weight grid array, the code in rkisp1-params.c should be adjusted to iterate it 25 times
- some minor typo and checkpatch fixes.
changes since v5:
- move grid reduction for V10 to separate patch (Hans)
- fix commit message (histogram size 28 -> 25) in patch4 (Hans)
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
Dafna Hirschfeld (2):
media: rkisp1: uapi: change hist_bins array type from __u16 to __u32
media: rkisp1: stats: remove a wrong cast to u8
Heiko Stuebner (3):
media: rockchip: rkisp1: reduce number of histogram grid elements in
uapi
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 | 5 +- .../platform/rockchip/rkisp1/rkisp1-stats.c | 15 +++- include/uapi/linux/rkisp1-config.h | 84 ++++++++++++++++--- 5 files changed, 116 insertions(+), 25 deletions(-)
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v7 1/5 media: rkisp1: uapi: change hist_bins array type from __u16 to __u32
Each entry in the array is a 20 bits value composed of 16 bits unsigned integer and 4 bits fractional part. So the type should change to __u32.
In addition add a documentation of how the measurements are done.
--- include/uapi/linux/rkisp1-config.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
include/uapi/linux/rkisp1-config.h +8 -4
@@ -844,13 +844,17 @@ struct rkisp1_cif_isp_af_stat {/** * struct rkisp1_cif_isp_hist_stat - statistics histogram data * -* @hist_bins: measured bin counters +* @hist_bins: measured bin counters. Each bin is a 20 bits unsigned fixed point type. +* Bits 0-4 are the fractional part and bits 5-19 are the integer part. * -* Measurement window divided into 25 sub-windows, set -* with ISP_HIST_XXX +* The window of the measurements area is divided to 5x5 sub-windows. The histogram +* is then computed for each sub-window independently and the final result is a weighted +* average of the histogram measurements on all sub-windows. +* The window of the measurements area and the weight of each sub-window are configurable +* using struct @rkisp1_cif_isp_hst_config. */ struct rkisp1_cif_isp_hist_stat { -__u16 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ]; +__u32 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ]; };/**
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v7 1/5] media: rkisp1: uapi: change hist_bins array type from __u16 to __u32
Hi Dafna,
Thanks for the update.
Quoted 5 lines · Dafna Hirschfeld
Each entry in the array is a 20 bits value composed of 16 bits unsigned integer and 4 bits fractional part. So the type should change to
__u32.
In addition add a documentation of how the measurements are done.
The commit message lines wrap at 74, under 60 is not much.
Quoted 2 lines
Signed-off-by Dafna Hirschfeld <[email protected]>
Should there be a Fixes: line? The patch is changing UAPI...
The file has been recently introduced. Should it go to fixes or to a stable kernel, too?
Quoted 13 lines
--- include/uapi/linux/rkisp1-config.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)include/uapi/linux/rkisp1-config.h +0
-1@@ -844,13 +844,17 @@ struct rkisp1_cif_isp_af_stat {/** * struct rkisp1_cif_isp_hist_stat - statistics histogram data * -* @hist_bins: measured bin counters
include/uapi/linux/rkisp1-config.h struct rkisp1_cif_isp_af_stat { · line 854
Quoted 10 lines
include/uapi/linux/rkisp1-config.h +7
-2+* @hist_bins: measured bin counters. Each bin is a 20 bits unsigned fixed point type. +* Bits 0-4 are the fractional part and bits 5-19 are the integer part. * -* Measurement window divided into 25 sub-windows, set -* with ISP_HIST_XXX +* The window of the measurements area is divided to 5x5 sub-windows. The histogram +* is then computed for each sub-window independently and the final result is a weighted +* average of the histogram measurements on all sub-windows. +* The window of the measurements area and the weight of each sub-window are configurable +* using struct @rkisp1_cif_isp_hst_config.
Please wrap the lines before 80.
Quoted 10 lines
include/uapi/linux/rkisp1-config.h +1
-1*/ struct rkisp1_cif_isp_hist_stat { -__u16 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ]; +__u32 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ]; };/** Signature · 1 line
2.17.1
Signature · 8 lines
Regards, Sakari Ailus _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v7 1/5] media: rkisp1: uapi: change hist_bins array type from __u16 to __u32
Am 20.01.21 um 22:32 schrieb Sakari Ailus:
Quoted 14 lines
Hi Dafna,
Thanks for the update.
Quoted 5 lines · Dafna Hirschfeld
Each entry in the array is a 20 bits value composed of 16 bits unsigned integer and 4 bits fractional part. So the type should change to
__u32.
In addition add a documentation of how the measurements are done.The commit message lines wrap at 74, under 60 is not much.
Quoted 1 line
Quoted 6 lines
Quoted 1 line
Signed-off-by Dafna Hirschfeld <[email protected]>Should there be a Fixes: line? The patch is changing UAPI...
The file has been recently introduced. Should it go to fixes or to a stable kernel, too?
The file was in the staging directory and will be first destaged in the coming 5.11, so I don't think this is necessary.
Quoted 18 lines
Quoted 18 lines
--- include/uapi/linux/rkisp1-config.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)include/uapi/linux/rkisp1-config.h +2
-2@@ -844,13 +844,17 @@ struct rkisp1_cif_isp_af_stat {/** * struct rkisp1_cif_isp_hist_stat - statistics histogram data * -* @hist_bins: measured bin counters +* @hist_bins: measured bin counters. Each bin is a 20 bits unsigned fixed point type. +* Bits 0-4 are the fractional part and bits 5-19 are the integer part. * -* Measurement window divided into 25 sub-windows, set
Quoted 8 lines
include/uapi/linux/rkisp1-config.h struct rkisp1_cif_isp_af_stat { · line 854
Quoted 6 lines
include/uapi/linux/rkisp1-config.h +5
-1-* with ISP_HIST_XXX +* The window of the measurements area is divided to 5x5 sub-windows. The histogram +* is then computed for each sub-window independently and the final result is a weighted +* average of the histogram measurements on all sub-windows. +* The window of the measurements area and the weight of each sub-window are configurable +* using struct @rkisp1_cif_isp_hst_config. Please wrap the lines before 80.
ok,
Thanks,
Dafna
Quoted 7 lines
Quoted 7 lines
include/uapi/linux/rkisp1-config.h +1
-1*/ struct rkisp1_cif_isp_hist_stat { -__u16 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ]; +__u32 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ]; };
Quoted 5 lines
Quoted 4 lines
include/uapi/linux/rkisp1-config.h +0
-0/** Signature · 1 line
2.17.1
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v7 1/5] media: rkisp1: uapi: change hist_bins array type from __u16 to __u32
Hi Dafna,
Quoted 19 lines · Dafna Hirschfeld
Am 20.01.21 um 22:32 schrieb Sakari Ailus:
Quoted 16 lines
Hi Dafna,
Thanks for the update.
Quoted 5 lines · Dafna Hirschfeld
Each entry in the array is a 20 bits value composed of 16 bits unsigned integer and 4 bits fractional part. So the type should change to
__u32.
In addition add a documentation of how the measurements are done.The commit message lines wrap at 74, under 60 is not much.
Quoted 2 lines
Signed-off-by Dafna Hirschfeld <[email protected]>
Quoted 7 lines
Quoted 4 lines
Should there be a Fixes: line? The patch is changing UAPI...
The file has been recently introduced. Should it go to fixes or to a stable kernel, too?
The file was in the staging directory and will be first destaged in the coming 5.11, so I don't think this is necessary.
You still probably want to avoid making the uAPI change after 5.11, so the fixes branch would be the right target I presume.
Signature · 6 lines
Sakari Ailus _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v7 2/5 media: rkisp1: stats: remove a wrong cast to u8
In reply to Dafna Hirschfeldhist_bins is an array of type __u32. Each entry represent a 20 bit fixed point value as documented inline. The cast to u8 when setting the values is wrong. Remove it.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +1 -2
@@ -235,8 +235,7 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, pbuf->meas_type |=RKISP1_CIF_ISP_STAT_HIST ;for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX ; i++) pbuf->params.hist.hist_bins[i] = - (u8 )rkisp1_read (rkisp1, -RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); +rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); } static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats,
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v7 2/5] media: rkisp1: stats: remove a wrong cast to u8
Am Mittwoch, 20. Januar 2021, 17:44:43 CET schrieb Dafna Hirschfeld:
Quoted 5 lines
hist_binsis an array of type__u32. Each entry represent a 20 bit fixed point value as documented inline. The cast to u8 when setting the values is wrong. Remove it.Signed-off-by Dafna Hirschfeld <[email protected]>
Quoted 10 lines
--- drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +0
-0
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, · line 241
Quoted 9 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +1
-2@@ -235,8 +235,7 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, pbuf->meas_type |=RKISP1_CIF_ISP_STAT_HIST ;for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX ; i++) pbuf->params.hist.hist_bins[i] = - (u8 )rkisp1_read (rkisp1, -RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); +rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); } static void rkisp1_stats_get_bls_meas(struct rkisp1_stats *stats,
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v7 2/5] media: rkisp1: stats: remove a wrong cast to u8
In reply to Dafna HirschfeldHi Dafna,
Quoted 4 lines · Dafna Hirschfeld
hist_binsis an array of type__u32. Each entry represent a 20 bit fixed point value as documented inline. The cast to u8 when setting the values is wrong. Remove it.
Thanks for the patch. See my comment inline.
Quoted 11 lines
Signed-off-by Dafna Hirschfeld <[email protected]>--- drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +0
-0
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, · line 238
Quoted 6 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +1
-2@@ -235,8 +235,7 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, pbuf->meas_type |=RKISP1_CIF_ISP_STAT_HIST ;for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX ; i++) pbuf->params.hist.hist_bins[i] = - (u8 )rkisp1_read (rkisp1, -RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); +rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 );
Is the register guaranteed to return 0 for the upper unused 12 bits? Should we mask them instead?
Best regards,
Tomasz
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v7 2/5] media: rkisp1: stats: remove a wrong cast to u8
Am 21.01.21 um 11:07 schrieb Tomasz Figa:
Quoted 17 lines
Hi Dafna,
Quoted 4 lines · Dafna Hirschfeld
hist_binsis an array of type__u32. Each entry represent a 20 bit fixed point value as documented inline. The cast to u8 when setting the values is wrong. Remove it.Thanks for the patch. See my comment inline.
Quoted 6 lines
Signed-off-by Dafna Hirschfeld <[email protected]>--- drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 14 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, · line 238
Quoted 11 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +1
-2@@ -235,8 +235,7 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats, pbuf->meas_type |=RKISP1_CIF_ISP_STAT_HIST ;for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX ; i++) pbuf->params.hist.hist_bins[i] = - (u8 )rkisp1_read (rkisp1, -RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); +rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 );Is the register guaranteed to return 0 for the upper unused 12 bits? Should we mask them instead?
I printed the values and I always see 0 for the last 12 bits. But the datasheet does not say that explicitly.
I can add a mask to be on the safe side.
Thanks,
Dafna
Quoted 4 lines
Best regards,
Tomasz
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v7 3/5 media: rockchip: rkisp1: reduce number of histogram grid elements in uapi
In reply to Dafna HirschfeldFrom: Heiko Stuebner <[email protected]>
The uapi right now specifies an array size of 28 but the actual number of elements is only 25 with the last 3 being unused.
Reduce the array size to the correct number of elements and change the params code to iterate the array 25 times.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 3 ++- include/uapi/linux/rkisp1-config.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +2 -1
@@ -589,7 +589,6 @@ static void rkisp1_hst_config(struct rkisp1_params *params,RKISP1_CIF_ISP_HIST_WEIGHT_22TO03 ,RKISP1_CIF_ISP_HIST_WEIGHT_13TO43 , RKISP1_CIF_ISP_HIST_WEIGHT_04TO34, - RKISP1_CIF_ISP_HIST_WEIGHT_44, };const u8 *weight;unsigned int i;
@@ -622,6 +621,8 @@ static void rkisp1_hst_config(struct rkisp1_params *params, weight[2], weight[3]), hist_weight_regs[i]); + +rkisp1_write (params->rkisp1, weight[0 ] &0x1F ,RKISP1_CIF_ISP_HIST_WEIGHT_44 ); } static void
include/uapi/linux/rkisp1-config.h +1 -2
@@ -102,8 +102,7 @@/* * Histogram calculation */ -/* Last 3 values unused. */ -#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 28 +#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 25/* * Defect Pixel Cluster Correction
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v7 4/5 media: rockchip: rkisp1: carry ip version information
In reply to Dafna HirschfeldFrom: 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 | 15 +++++++++++++ 3 files changed, 43 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 +15 -0
@@ -123,6 +123,21 @@#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.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v7 5/5 media: rockchip: rkisp1: extend uapi array sizes
In reply to Dafna HirschfeldFrom: 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 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.
--- .../platform/rockchip/rkisp1/rkisp1-params.c | 2 +- .../platform/rockchip/rkisp1/rkisp1-stats.c | 12 +++- include/uapi/linux/rkisp1-config.h | 66 ++++++++++++++++--- 3 files changed, 67 insertions(+), 13 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 than 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] =rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); }
include/uapi/linux/rkisp1-config.h +56 -10
108 lines not on this page · raw message
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v7 5/5] media: rockchip: rkisp1: extend uapi array sizes
Hi Dafna,
Quoted 13 lines · Dafna Hirschfeld
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_SIZE25 -> 81and we can still extend the uapi during the 5.11-rc cycle, so do that now to be on the safe side.
Quoted 6 lines
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.
Hmm, wouldn't the buffer be already zeroed at allocation time?
I can see that vb2-vmalloc would call vmalloc_user() which does zero the allocated memory:
https://elixir.bootlin.com/linux/v5.10.9/source/mm/vmalloc.c#L2661
Best regards,
Tomasz
Quoted 176 lines
Signed-off-by Heiko Stuebner <[email protected]>Signed-off-by Dafna Hirschfeld <[email protected]>Reviewed-by Ezequiel Garcia <[email protected]>Acked-by Helen Koike <[email protected]>--- .../platform/rockchip/rkisp1/rkisp1-params.c | 2 +- .../platform/rockchip/rkisp1/rkisp1-stats.c | 12 +++- include/uapi/linux/rkisp1-config.h | 66 ++++++++++++++++--- 3 files changed, 67 insertions(+), 13 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 than 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] =rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); }include/uapi/linux/rkisp1-config.h +56
-11@@ -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 @@ -102,7 +110,9 @@/* * Histogram calculation */ -#define RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE 25 +#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 @@ -524,6 +534,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;@@ -538,6 +557,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;@@ -825,7 +853,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 ];@@ -861,11 +897,21 @@ struct rkisp1_cif_isp_af_stat {* @hist_bins: measured bin counters. Each bin is a 20 bits unsigned fixed point type. * Bits 0-4 are the fractional part and bits 5-19 are the integer part. * -* The window of the measurements area is divided to 5x5 sub-windows. The histogram -* is then computed for each sub-window independently and the final result is a weighted -* average of the histogram measurements on all sub-windows. -* The window of the measurements area and the weight of each sub-window are configurable -* using struct @rkisp1_cif_isp_hst_config. +* The window of the measurements area is divided to 5x5 sub-windows for V10/V11 and +* to 9x9 sub-windows for V12. The histogram is computed for each sub-window +* independently and the final result is a weighted average of the histogram measurements +* on all sub-windows. The window of the measurements area and the weight of each +* sub-window are configurable using struct @rkisp1_cif_isp_hst_config. +* +* The histogram contains 16 bins in V10/V11 and 32 bins in V12/V13. +* +* 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 {__u32 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ]; --
Quoted 2 lines
2.17.1
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip