Fix the rkisp1 userspace API for later IP versions
Subsystems (3)
v8 cover Fix the rkisp1 userspace API for later IP versions
This is v8 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 v7:
- in patch 1, wrap long lines
- add a patch that masks out the unused bits in hist_bins enteries.
- in the last patch, in the last patch, remove unneeded memset of the stats arries
- no changes in other patches appart of rebase
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 (3):
media: rkisp1: uapi: change hist_bins array type from __u16 to __u32
media: rkisp1: stats: remove a wrong cast to u8
media: rkisp1: stats: mask the hist_bins values
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-regs.h | 1 + .../platform/rockchip/rkisp1/rkisp1-stats.c | 11 +-- include/uapi/linux/rkisp1-config.h | 86 ++++++++++++++++--- 6 files changed, 114 insertions(+), 26 deletions(-)
Signature · 7 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v8 1/6 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 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
include/uapi/linux/rkisp1-config.h +9 -4
@@ -844,13 +844,18 @@ 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
PATCH v8 2/6 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
PATCH v8 3/6 media: rkisp1: stats: mask the hist_bins values
In reply to Dafna Hirschfeldhist_bins is an array of type __u32. Each entry represents a 20 bit value. So mask out the unused bits.
--- drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h | 1 + drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h +1 -0
@@ -365,6 +365,7 @@#define RKISP1_CIF_ISP_MAX_HIST_PREDIVIDER 0x0000007F#define RKISP1_CIF_ISP_HIST_ROW_NUM 5#define RKISP1_CIF_ISP_HIST_COLUMN_NUM 5 +#define RKISP1_CIF_ISP_HIST_GET_BIN (x) ((x) & 0x000FFFFF)/* AUTO FOCUS MEASUREMENT: ISP_AFM_CTRL */ #define RKISP1_ISP_AFM_CTRL_ENABLE BIT(0)
drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +5 -3
@@ -233,9 +233,11 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats,unsigned int i; 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] = -rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); +for (i =0 ; i <RKISP1_CIF_ISP_HIST_BIN_N_MAX ; i++) { +u32 reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); + + pbuf->params.hist.hist_bins[i] =RKISP1_CIF_ISP_HIST_GET_BIN (reg_val); + } } 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
PATCH v8 4/6 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
Re: [PATCH v8 4/6] media: rockchip: rkisp1: reduce number of histogram grid elements in uapi
Hi Dafna,
Quoted 28 lines · Dafna Hirschfeld
From: 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.
Signed-off-by Heiko Stuebner <[email protected]>Signed-off-by Dafna Hirschfeld <[email protected]>--- 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 +0
-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;
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c static void rkisp1_hst_config(struct rkisp1_params *params, · line 625
Quoted 5 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +2
-0@@ -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 );
I just noticed that the default value to arg->hist_weight was:
memset(hst.hist_weight, 0x01, sizeof(hst.hist_weight));
Shouldn't the value be RKISP1_CIF_ISP_HIST_WEIGHT_SET(weight[0], 0x01, 0x01, 0x01) ? Or am I missing something?
Thanks
Helen
Quoted 9 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +0
-0} static voidinclude/uapi/linux/rkisp1-config.h +0
-0
include/uapi/linux/rkisp1-config.h line 108
Quoted 9 lines
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
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stübner
maintainerRe: [PATCH v8 4/6] media: rockchip: rkisp1: reduce number of histogram grid elements in uapi
Hi Helen,
Am Donnerstag, 21. Januar 2021, 18:04:49 CET schrieb Helen Koike:
Quoted 39 lines
Hi Dafna,
Quoted 28 lines · Dafna Hirschfeld
From: 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.
Signed-off-by Heiko Stuebner <[email protected]>Signed-off-by Dafna Hirschfeld <[email protected]>--- 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 +0
-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;drivers/media/platform/rockchip/rkisp1/rkisp1-params.c static void rkisp1_hst_config(struct rkisp1_params *params, · line 625
Quoted 5 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +2
-0@@ -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 );I just noticed that the default value to
arg->hist_weightwas:
Quoted 4 lines
memset(hst.hist_weight, 0x01, sizeof(hst.hist_weight));Shouldn't the value be
RKISP1_CIF_ISP_HIST_WEIGHT_SET(weight[0], 0x01, 0x01, 0x01)? Or am I missing something?
The last register only has that one value from weight[24];
I.e. before we were writing the 4 values into that last register as well from indices 24, 25, 26, 27 ... hence the 3 unused values in the weight array.
But that was merely a crutch to make that fit into the write loop.
Heiko
Quoted 15 lines
Quoted 15 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +0
-0} static voidinclude/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
Quoted 4 lines
include/uapi/linux/rkisp1-config.h line 108
Quoted 3 lines
include/uapi/linux/rkisp1-config.h +0
-0/* * Defect Pixel Cluster Correction
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Helen Koike
Acked-byRe: [PATCH v8 4/6] media: rockchip: rkisp1: reduce number of histogram grid elements in uapi
Quoted 47 lines · Heiko Stübner
Hi Helen,
Am Donnerstag, 21. Januar 2021, 18:04:49 CET schrieb Helen Koike:
Quoted 39 lines
Hi Dafna,
Quoted 28 lines · Dafna Hirschfeld
From: 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.
Signed-off-by Heiko Stuebner <[email protected]>Signed-off-by Dafna Hirschfeld <[email protected]>--- 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 +0
-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;drivers/media/platform/rockchip/rkisp1/rkisp1-params.c static void rkisp1_hst_config(struct rkisp1_params *params, · line 625
Quoted 5 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +2
-0@@ -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 );I just noticed that the default value to
arg->hist_weightwas:Quoted 4 lines
memset(hst.hist_weight, 0x01, sizeof(hst.hist_weight));Shouldn't the value be
RKISP1_CIF_ISP_HIST_WEIGHT_SET(weight[0], 0x01, 0x01, 0x01)? Or am I missing something?
Quoted 6 lines
The last register only has that one value from weight[24];
I.e. before we were writing the 4 values into that last register as well from indices 24, 25, 26, 27 ... hence the 3 unused values in the weight array.
But that was merely a crutch to make that fit into the write loop.
right, lgtm, thank you and Dafna for working on this.
For the whole series:
Regards,
Helen
Quoted 28 lines
Heiko
Quoted 19 lines
Quoted 18 lines
drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +0
-0} static voidinclude/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
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v8 5/6 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 v8 6/6 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 | 4 +- include/uapi/linux/rkisp1-config.h | 67 ++++++++++++++++--- 3 files changed, 60 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 +2 -2
@@ -203,7 +203,7 @@ static void rkisp1_stats_get_aec_meas(struct rkisp1_stats *stats,unsigned int i; 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 );
@@ -233,7 +233,7 @@ static void rkisp1_stats_get_hst_meas(struct rkisp1_stats *stats,unsigned int i; 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++) {u32 reg_val =rkisp1_read (rkisp1,RKISP1_CIF_ISP_HIST_BIN_0 + i *4 ); pbuf->params.hist.hist_bins[i] =RKISP1_CIF_ISP_HIST_GET_BIN (reg_val);
include/uapi/linux/rkisp1-config.h +57 -10
109 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