Fix the rkisp1 userspace API for later IP versions
Subsystems (3)
Heiko Stuebner
maintainerv3 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 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 (2):
media: rockchip: rkisp1: carry ip version information
media: rockchip: rkisp1: extend uapi array sizes
Documentation/admin-guide/media/rkisp1.rst | 15 +++++++ .../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 | 43 ++++++++++++++++--- 5 files changed, 76 insertions(+), 17 deletions(-)
Signature · 7 lines
2.29.2 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stuebner
maintainerPATCH v3 1/2 media: rockchip: rkisp1: carry ip version information
From: 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 | 15 +++++++++++++ .../platform/rockchip/rkisp1/rkisp1-dev.c | 21 +++++++++++-------- include/uapi/linux/rkisp1-config.h | 7 +++++++ 3 files changed, 34 insertions(+), 9 deletions(-)
Documentation/admin-guide/media/rkisp1.rst +15 -0
@@ -13,6 +13,21 @@ 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 in use are documented in enum 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. + +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 +7 -0
@@ -124,6 +124,13 @@#define RKISP1_CIF_ISP_STAT_AFM (1U << 2)#define RKISP1_CIF_ISP_STAT_HIST (1U << 3) +enum rkisp1_cif_isp_version { +RKISP1_V10 =0 , +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
Re: [PATCH v3 1/2] media: rockchip: rkisp1: carry ip version information
Hi Heiko,
Thanks a lot for pushing this.
Quoted 13 lines · Heiko Stuebner
From: 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_datato carry that information for future differentiation.Also carry that information in the
hw_revisionfield of the media- controller API, so that userspace also has access to that.
Quoted 7 lines
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 rk1808Signed-off-by Heiko Stuebner <[email protected]>
Regards,
Ezequiel
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 1/2] media: rockchip: rkisp1: carry ip version information
In reply to Heiko StuebnerAm 15.01.21 um 12:23 schrieb Heiko Stuebner:
Quoted 13 lines
From: 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_datato carry that information for future differentiation.Also carry that information in the
hw_revisionfield of the media- controller API, so that userspace also has access to that.
Quoted 7 lines
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 rk1808Signed-off-by Heiko Stuebner <[email protected]>
Quoted 112 lines
--- Documentation/admin-guide/media/rkisp1.rst | 15 +++++++++++++ .../platform/rockchip/rkisp1/rkisp1-dev.c | 21 +++++++++++-------- include/uapi/linux/rkisp1-config.h | 7 +++++++ 3 files changed, 34 insertions(+), 9 deletions(-)Documentation/admin-guide/media/rkisp1.rst +15
-0@@ -13,6 +13,21 @@ 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 in use are documented in enum 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. + +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 +0
-0@@ -124,6 +124,13 @@#define RKISP1_CIF_ISP_STAT_AFM (1U << 2)#define RKISP1_CIF_ISP_STAT_HIST (1U << 3)
include/uapi/linux/rkisp1-config.h line 136
Quoted 10 lines
include/uapi/linux/rkisp1-config.h +7
-0+enum rkisp1_cif_isp_version { +RKISP1_V10 =0 , +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 ,
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 1/2] media: rockchip: rkisp1: carry ip version information
In reply to Heiko StuebnerQuoted 31 lines · Heiko Stuebner
From: 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_datato carry that information for future differentiation.Also carry that information in the
hw_revisionfield 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 rk1808Signed-off-by Heiko Stuebner <[email protected]>--- Documentation/admin-guide/media/rkisp1.rst | 15 +++++++++++++ .../platform/rockchip/rkisp1/rkisp1-dev.c | 21 +++++++++++-------- include/uapi/linux/rkisp1-config.h | 7 +++++++ 3 files changed, 34 insertions(+), 9 deletions(-)Documentation/admin-guide/media/rkisp1.rst +0
-0
Documentation/admin-guide/media/rkisp1.rst This file documents the driver for the Rockchip ISP1 that is part of RK3288 · line 22
Quoted 10 lines
Documentation/admin-guide/media/rkisp1.rst +7
-0@@ -13,6 +13,21 @@ 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 in use are documented in enum 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.
No, struct media_device is internal to the kernel, userspace doesn't see this struct.
Replace this by:
"...struct media_device_info as returned by ioctl MEDIA_IOC_DEVICE_INFO."
Regards,
Hans
Quoted 91 lines
Documentation/admin-guide/media/rkisp1.rst +8
-0+ +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 +0
-0@@ -124,6 +124,13 @@#define RKISP1_CIF_ISP_STAT_AFM (1U << 2)#define RKISP1_CIF_ISP_STAT_HIST (1U << 3)
include/uapi/linux/rkisp1-config.h line 136
Quoted 10 lines
include/uapi/linux/rkisp1-config.h +7
-0+enum rkisp1_cif_isp_version { +RKISP1_V10 =0 , +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 ,
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 1/2] media: rockchip: rkisp1: carry ip version information
Am 15.01.21 um 15:02 schrieb Hans Verkuil:
Quoted 35 lines · Heiko Stuebner
Quoted 34 lines
From: 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_datato carry that information for future differentiation.Also carry that information in the
hw_revisionfield 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 rk1808Signed-off-by Heiko Stuebner <[email protected]>--- Documentation/admin-guide/media/rkisp1.rst | 15 +++++++++++++ .../platform/rockchip/rkisp1/rkisp1-dev.c | 21 +++++++++++-------- include/uapi/linux/rkisp1-config.h | 7 +++++++ 3 files changed, 34 insertions(+), 9 deletions(-)Documentation/admin-guide/media/rkisp1.rst +0
-0@@ -13,6 +13,21 @@ 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.
Quoted 5 lines
Documentation/admin-guide/media/rkisp1.rst This file documents the driver for the Rockchip ISP1 that is part of RK3288 · line 20
Quoted 5 lines
Documentation/admin-guide/media/rkisp1.rst +5
-0+Revisions +========= + +There exist multiple smaller revisions to this ISP that got introduced in +later SoCs. Revisions in use are documented in enum rkisp1_cif_isp_version
Hi,
since you send v4 anyway..
You can format "enum rkisp1_cif_isp_version" to "enum :c:type:rkisp1_cif_isp_version" But you actually document the revision here in this file and not "in enum rkisp1_cif_isp_version" Maybe it is actually better to document them inline (just above the enum decleration)
Thanks,
Dafna
Quoted 104 lines
Documentation/admin-guide/media/rkisp1.rst This file documents the driver for the Rockchip ISP1 that is part of RK3288 · line 22
Quoted 2 lines
Documentation/admin-guide/media/rkisp1.rst +2
-0+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.No, struct
media_deviceis internal to the kernel, userspace doesn't see this struct.Replace this by:
"...struct
media_device_infoas returned by ioctlMEDIA_IOC_DEVICE_INFO."Regards,
Hans
Quoted 90 lines
Documentation/admin-guide/media/rkisp1.rst +8
-0+ +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 +0
-0@@ -124,6 +124,13 @@#define RKISP1_CIF_ISP_STAT_AFM (1U << 2)#define RKISP1_CIF_ISP_STAT_HIST (1U << 3)
Quoted 12 lines
include/uapi/linux/rkisp1-config.h line 136
Quoted 11 lines
include/uapi/linux/rkisp1-config.h +7
-0+enum rkisp1_cif_isp_version { +RKISP1_V10 =0 , +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 ,
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stuebner
maintainerPATCH v3 2/2 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 | 36 ++++++++++++++++--- 3 files changed, 42 insertions(+), 8 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 +31 -5
@@ -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 28 +#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
@@ -517,6 +527,10 @@ 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 is dependent on the hw_revision, +* see RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10 vs _V12 and the +* global maximum is the bigger of the two. */ struct rkisp1_cif_isp_goc_config {__u32 mode;
@@ -531,6 +545,10 @@ 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 weighting factors is dependent on the hw_revision, +* see RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V10 vs _V12 and the +* global maximum is the bigger of the two. */ struct rkisp1_cif_isp_hst_config {__u32 mode;
@@ -818,7 +836,11 @@ 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 is dependent on the hw_revision, +* see RKISP1_CIF_ISP_AE_MEAN_MAX_V10 vs _V12 and the +* global maximum is the bigger 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 ];
@@ -855,6 +877,10 @@ struct rkisp1_cif_isp_af_stat {* * Measurement window divided into 25 sub-windows, set * with ISP_HIST_XXX +* +* The number of entries is dependent on the hw_revision, +* see RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 vs _V12 and the +* global maximum is the bigger of the two. */ struct rkisp1_cif_isp_hist_stat {__u16 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ];
Signature · 7 lines
2.29.2 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 2/2] media: rockchip: rkisp1: extend uapi array sizes
Quoted 12 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 -> 81and we can still extend the uapi during the 5.11-rc cycle, so do that now to be on the safe side.
Quoted 8 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.
Signed-off-by Heiko Stuebner <[email protected]>
Thanks,
Ezequiel
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Dafna Hirschfeld
Reviewed-byRe: [PATCH v3 2/2] media: rockchip: rkisp1: extend uapi array sizes
Am 15.01.21 um 13:21 schrieb Ezequiel Garcia:
Quoted 16 lines · Heiko Stuebner
Quoted 15 lines
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 -> 81and 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.
Quoted 7 lines
Quoted 5 lines
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]>
Thanks,
Dafna
Quoted 4 lines
Thanks,
Ezequiel
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 2/2] media: rockchip: rkisp1: extend uapi array sizes
In reply to Heiko StuebnerQuoted 115 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 -> 81and 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]>--- .../platform/rockchip/rkisp1/rkisp1-params.c | 2 +- .../platform/rockchip/rkisp1/rkisp1-stats.c | 12 +++++-- include/uapi/linux/rkisp1-config.h | 36 ++++++++++++++++--- 3 files changed, 42 insertions(+), 8 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 +14
-4@@ -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 28 +#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
include/uapi/linux/rkisp1-config.h enum rkisp1_cif_isp_goc_mode { · line 533
Quoted 7 lines
include/uapi/linux/rkisp1-config.h +4
-0@@ -517,6 +527,10 @@ 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 is dependent on the hw_revision, +* see RKISP1_CIF_ISP_GAMMA_OUT_MAX_SAMPLES_V10 vs _V12 and the +* global maximum is the bigger of the two.
This is too vague. How about this:
"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."
Similar text is needed elsewhere in this header as well were applicable.
Remember that this is a non-obvious difference, so more precise documentation than normally is needed.
Quoted 28 lines
include/uapi/linux/rkisp1-config.h +9
-1*/ struct rkisp1_cif_isp_goc_config {__u32 mode;@@ -531,6 +545,10 @@ 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 weighting factors is dependent on the hw_revision, +* see RKISP1_CIF_ISP_HISTOGRAM_WEIGHT_GRIDS_SIZE_V10 vs _V12 and the +* global maximum is the bigger of the two. */ struct rkisp1_cif_isp_hst_config {__u32 mode;@@ -818,7 +836,11 @@ 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 is dependent on the hw_revision, +* see RKISP1_CIF_ISP_AE_MEAN_MAX_V10 vs _V12 and the +* global maximum is the bigger 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 ];
include/uapi/linux/rkisp1-config.h struct rkisp1_cif_isp_af_stat { · line 878
Quoted 2 lines
include/uapi/linux/rkisp1-config.h +0
-0@@ -855,6 +877,10 @@ struct rkisp1_cif_isp_af_stat {* * Measurement window divided into 25 sub-windows, set
This is 25 for V10/11 and 81 for V12/13.
include/uapi/linux/rkisp1-config.h struct rkisp1_cif_isp_af_stat { · line 886
Quoted 9 lines
include/uapi/linux/rkisp1-config.h +4
-0* with ISP_HIST_XXX +* +* The number of entries is dependent on the hw_revision, +* see RKISP1_CIF_ISP_HIST_BIN_N_MAX_V10 vs _V12 and the +* global maximum is the bigger of the two. */ struct rkisp1_cif_isp_hist_stat {__u16 hist_bins[RKISP1_CIF_ISP_HIST_BIN_N_MAX ];
Regards,
Hans
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip