diff mbox series

[v2] media: rkisp1: Add the enum_frame_size ioctl

Message ID 20201207184358.3793-1-sebastian.fricke.linux@gmail.com
State New
Headers show
Series [v2] media: rkisp1: Add the enum_frame_size ioctl | expand

Commit Message

Sebastian Fricke Dec. 7, 2020, 6:43 p.m. UTC 
Implement the VIDIOC_SUBDEV_ENUM_FRAME_SIZE ioctl, check if the mbus
code is valid for the given pad. This call is not available for the
parameter or metadata pads of the RkISP1.

Signed-off-by: Sebastian Fricke <sebastian.fricke.linux@gmail.com>
---

Changes since v1:

- Replace the custom bus code check with the `rkisp1_isp_mbus_info_get`
  function
- Add a missing line break above the function

I have tested this patch with the following script:
https://github.com/initBasti/Linux_kernel_media_tree_fork/commit/efc4b399cff53fb36fadde999594961a3d84073e

The results on my NanoPC-T4 (Linux nanopct4 5.10.0-rc6-rockchip64):

pad 0 = RKISP1_ISP_PAD_SINK_VIDEO
pad 1 = RKISP1_ISP_PAD_SINK_PARAMS
pad 2 = RKISP1_ISP_PAD_SOURCE_VIDEO
pad 3 = RKISP1_ISP_PAD_SOURCE_STATS

basti@nanopct4:~$ python3 rkisp1_enum_frame_size_test.py 
TEST  0: pad 0 - code 0x300f - size 32x32 - 4032x3024
TEST  1: pad 0 - code 0x3007 - size 32x32 - 4032x3024
TEST  2: pad 0 - code 0x300e - size 32x32 - 4032x3024
TEST  3: pad 0 - code 0x300a - size 32x32 - 4032x3024
TEST  4: pad 0 - code 0x3012 - size 32x32 - 4032x3024
TEST  5: pad 0 - code 0x3008 - size 32x32 - 4032x3024
TEST  6: pad 0 - code 0x3010 - size 32x32 - 4032x3024
TEST  7: pad 0 - code 0x3011 - size 32x32 - 4032x3024
TEST  8: pad 0 - code 0x3014 - size 32x32 - 4032x3024
TEST  9: pad 0 - code 0x3001 - size 32x32 - 4032x3024
TEST 10: pad 0 - code 0x3013 - size 32x32 - 4032x3024
TEST 11: pad 0 - code 0x3002 - size 32x32 - 4032x3024
TEST 12: pad 0 - code 0x2011 - size 32x32 - 4032x3024
TEST 13: pad 0 - code 0x2012 - size 32x32 - 4032x3024
TEST 14: pad 0 - code 0x200f - size 32x32 - 4032x3024
TEST 15: pad 0 - code 0x2010 - size 32x32 - 4032x3024
TEST 16: pad 1 - code 0x7001 - size /
TEST 17: pad 2 - code 0x2008 - size 32x32 - 4032x3024
TEST 18: pad 2 - code 0x300f - size 32x32 - 4032x3024
TEST 19: pad 2 - code 0x3007 - size 32x32 - 4032x3024
TEST 20: pad 2 - code 0x300e - size 32x32 - 4032x3024
TEST 21: pad 2 - code 0x300a - size 32x32 - 4032x3024
TEST 22: pad 2 - code 0x3012 - size 32x32 - 4032x3024
TEST 23: pad 2 - code 0x3008 - size 32x32 - 4032x3024
TEST 24: pad 2 - code 0x3010 - size 32x32 - 4032x3024
TEST 25: pad 2 - code 0x3011 - size 32x32 - 4032x3024
TEST 26: pad 2 - code 0x3014 - size 32x32 - 4032x3024
TEST 27: pad 2 - code 0x3001 - size 32x32 - 4032x3024
TEST 28: pad 2 - code 0x3013 - size 32x32 - 4032x3024
TEST 29: pad 2 - code 0x3002 - size 32x32 - 4032x3024
TEST 30: pad 3 - code 0x7001 - size /
TEST 31: pad 0 - code 0xdead - size / (test with an invalid media bus code)
TEST 32: pad 6 - code 0x300f - size / (test with an invalid pad)
TEST 33: pad 0 - code 0x2008 - size / (test with a format that is not supported by the pad)
TEST 34: pad 2 - code 0x2010 - size / (test with a format that is not supported by the pad)

basti@nanopct4:~/libcamera$ v4l2-compliance
...
Format ioctls (Input 0):
    test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK
...

---

 .../platform/rockchip/rkisp1/rkisp1-isp.c     | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

Comments

Dafna Hirschfeld Dec. 8, 2020, 6:59 p.m. UTC | #1 
Hi

Am 07.12.20 um 19:43 schrieb Sebastian Fricke:
> Implement the VIDIOC_SUBDEV_ENUM_FRAME_SIZE ioctl, check if the mbus


I would add a to the description the entity to which you add the ioctl:
"Implement the VIDIOC_SUBDEV_ENUM_FRAME_SIZE ioctl for the isp entity"

Also, the the commit subject cab be prefixed with the isp:
media: rkisp1: isp: ..

> code is valid for the given pad. This call is not available for the

> parameter or metadata pads of the RkISP1.

> 

> Signed-off-by: Sebastian Fricke <sebastian.fricke.linux@gmail.com>

> ---

> 

> Changes since v1:

> 

> - Replace the custom bus code check with the `rkisp1_isp_mbus_info_get`

>    function

> - Add a missing line break above the function

> 

> I have tested this patch with the following script:

> https://github.com/initBasti/Linux_kernel_media_tree_fork/commit/efc4b399cff53fb36fadde999594961a3d84073e

> 

> The results on my NanoPC-T4 (Linux nanopct4 5.10.0-rc6-rockchip64):

> 

> pad 0 = RKISP1_ISP_PAD_SINK_VIDEO

> pad 1 = RKISP1_ISP_PAD_SINK_PARAMS

> pad 2 = RKISP1_ISP_PAD_SOURCE_VIDEO

> pad 3 = RKISP1_ISP_PAD_SOURCE_STATS

> 

> basti@nanopct4:~$ python3 rkisp1_enum_frame_size_test.py

> TEST  0: pad 0 - code 0x300f - size 32x32 - 4032x3024

> TEST  1: pad 0 - code 0x3007 - size 32x32 - 4032x3024

> TEST  2: pad 0 - code 0x300e - size 32x32 - 4032x3024

> TEST  3: pad 0 - code 0x300a - size 32x32 - 4032x3024

> TEST  4: pad 0 - code 0x3012 - size 32x32 - 4032x3024

> TEST  5: pad 0 - code 0x3008 - size 32x32 - 4032x3024

> TEST  6: pad 0 - code 0x3010 - size 32x32 - 4032x3024

> TEST  7: pad 0 - code 0x3011 - size 32x32 - 4032x3024

> TEST  8: pad 0 - code 0x3014 - size 32x32 - 4032x3024

> TEST  9: pad 0 - code 0x3001 - size 32x32 - 4032x3024

> TEST 10: pad 0 - code 0x3013 - size 32x32 - 4032x3024

> TEST 11: pad 0 - code 0x3002 - size 32x32 - 4032x3024

> TEST 12: pad 0 - code 0x2011 - size 32x32 - 4032x3024

> TEST 13: pad 0 - code 0x2012 - size 32x32 - 4032x3024

> TEST 14: pad 0 - code 0x200f - size 32x32 - 4032x3024

> TEST 15: pad 0 - code 0x2010 - size 32x32 - 4032x3024

> TEST 16: pad 1 - code 0x7001 - size /

> TEST 17: pad 2 - code 0x2008 - size 32x32 - 4032x3024

> TEST 18: pad 2 - code 0x300f - size 32x32 - 4032x3024

> TEST 19: pad 2 - code 0x3007 - size 32x32 - 4032x3024

> TEST 20: pad 2 - code 0x300e - size 32x32 - 4032x3024

> TEST 21: pad 2 - code 0x300a - size 32x32 - 4032x3024

> TEST 22: pad 2 - code 0x3012 - size 32x32 - 4032x3024

> TEST 23: pad 2 - code 0x3008 - size 32x32 - 4032x3024

> TEST 24: pad 2 - code 0x3010 - size 32x32 - 4032x3024

> TEST 25: pad 2 - code 0x3011 - size 32x32 - 4032x3024

> TEST 26: pad 2 - code 0x3014 - size 32x32 - 4032x3024

> TEST 27: pad 2 - code 0x3001 - size 32x32 - 4032x3024

> TEST 28: pad 2 - code 0x3013 - size 32x32 - 4032x3024

> TEST 29: pad 2 - code 0x3002 - size 32x32 - 4032x3024

> TEST 30: pad 3 - code 0x7001 - size /

> TEST 31: pad 0 - code 0xdead - size / (test with an invalid media bus code)

> TEST 32: pad 6 - code 0x300f - size / (test with an invalid pad)

> TEST 33: pad 0 - code 0x2008 - size / (test with a format that is not supported by the pad)

> TEST 34: pad 2 - code 0x2010 - size / (test with a format that is not supported by the pad)

> 

> basti@nanopct4:~/libcamera$ v4l2-compliance

> ...

> Format ioctls (Input 0):

>      test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK


when you just run v4l2-compliance without params, it runs only on /dev/video0
You should run it on the isp subdeivce node: '-d /dev/v4l-subdev0'

Thanks,
Dafna

> ...

> 

> ---

> 

>   .../platform/rockchip/rkisp1/rkisp1-isp.c     | 34 +++++++++++++++++++

>   1 file changed, 34 insertions(+)

> 

> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c

> index 889982d8ca41..642dd13137d3 100644

> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c

> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c

> @@ -600,6 +600,39 @@ static int rkisp1_isp_enum_mbus_code(struct v4l2_subdev *sd,

>   	return -EINVAL;

>   }

>   

> +static int rkisp1_isp_enum_frame_size(struct v4l2_subdev *sd,

> +				      struct v4l2_subdev_pad_config *cfg,

> +				      struct v4l2_subdev_frame_size_enum *fse)

> +{

> +	const struct rkisp1_isp_mbus_info *mbus_info;

> +

> +	if (fse->pad == RKISP1_ISP_PAD_SINK_PARAMS ||

> +	    fse->pad == RKISP1_ISP_PAD_SOURCE_STATS)

> +		return -EINVAL;

> +

> +	if (fse->index > 0)

> +		return -EINVAL;

> +

> +	mbus_info = rkisp1_isp_mbus_info_get(fse->code);

> +	if (!mbus_info)

> +		return -EINVAL;

> +

> +	if (!(mbus_info->direction & RKISP1_ISP_SD_SINK) &&

> +	    fse->pad == RKISP1_ISP_PAD_SINK_VIDEO)

> +		return -EINVAL;

> +

> +	if (!(mbus_info->direction & RKISP1_ISP_SD_SRC) &&

> +	    fse->pad == RKISP1_ISP_PAD_SOURCE_VIDEO)

> +		return -EINVAL;

> +

> +	fse->min_width = RKISP1_ISP_MIN_WIDTH;

> +	fse->max_width = RKISP1_ISP_MAX_WIDTH;

> +	fse->min_height = RKISP1_ISP_MIN_HEIGHT;

> +	fse->max_height = RKISP1_ISP_MAX_HEIGHT;

> +

> +	return 0;

> +}

> +

>   static int rkisp1_isp_init_config(struct v4l2_subdev *sd,

>   				  struct v4l2_subdev_pad_config *cfg)

>   {

> @@ -880,6 +913,7 @@ static int rkisp1_subdev_link_validate(struct media_link *link)

>   

>   static const struct v4l2_subdev_pad_ops rkisp1_isp_pad_ops = {

>   	.enum_mbus_code = rkisp1_isp_enum_mbus_code,

> +	.enum_frame_size = rkisp1_isp_enum_frame_size,

>   	.get_selection = rkisp1_isp_get_selection,

>   	.set_selection = rkisp1_isp_set_selection,

>   	.init_cfg = rkisp1_isp_init_config,

>
diff mbox series

Patch

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
index 889982d8ca41..642dd13137d3 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
@@ -600,6 +600,39 @@  static int rkisp1_isp_enum_mbus_code(struct v4l2_subdev *sd,
 	return -EINVAL;
 }
 
+static int rkisp1_isp_enum_frame_size(struct v4l2_subdev *sd,
+				      struct v4l2_subdev_pad_config *cfg,
+				      struct v4l2_subdev_frame_size_enum *fse)
+{
+	const struct rkisp1_isp_mbus_info *mbus_info;
+
+	if (fse->pad == RKISP1_ISP_PAD_SINK_PARAMS ||
+	    fse->pad == RKISP1_ISP_PAD_SOURCE_STATS)
+		return -EINVAL;
+
+	if (fse->index > 0)
+		return -EINVAL;
+
+	mbus_info = rkisp1_isp_mbus_info_get(fse->code);
+	if (!mbus_info)
+		return -EINVAL;
+
+	if (!(mbus_info->direction & RKISP1_ISP_SD_SINK) &&
+	    fse->pad == RKISP1_ISP_PAD_SINK_VIDEO)
+		return -EINVAL;
+
+	if (!(mbus_info->direction & RKISP1_ISP_SD_SRC) &&
+	    fse->pad == RKISP1_ISP_PAD_SOURCE_VIDEO)
+		return -EINVAL;
+
+	fse->min_width = RKISP1_ISP_MIN_WIDTH;
+	fse->max_width = RKISP1_ISP_MAX_WIDTH;
+	fse->min_height = RKISP1_ISP_MIN_HEIGHT;
+	fse->max_height = RKISP1_ISP_MAX_HEIGHT;
+
+	return 0;
+}
+
 static int rkisp1_isp_init_config(struct v4l2_subdev *sd,
 				  struct v4l2_subdev_pad_config *cfg)
 {
@@ -880,6 +913,7 @@  static int rkisp1_subdev_link_validate(struct media_link *link)
 
 static const struct v4l2_subdev_pad_ops rkisp1_isp_pad_ops = {
 	.enum_mbus_code = rkisp1_isp_enum_mbus_code,
+	.enum_frame_size = rkisp1_isp_enum_frame_size,
 	.get_selection = rkisp1_isp_get_selection,
 	.set_selection = rkisp1_isp_set_selection,
 	.init_cfg = rkisp1_isp_init_config,