v4l2-dev/ioctl: Add V4L2_CAP_IO_MC
Subsystems (5)
v4 cover v4l2-dev/ioctl: Add V4L2_CAP_IO_MC
Hi,
This series aims to reduce the amount of boiler plate code in video device drivers who's inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API.
Patch 1/3 adds a new video device capability flag V4L2_CAP_IO_MC which if set provides helper implementations for the enum inputs and outputs ioctrls freeing the video device driver from the need to implement them.
Patch 2/3 and 3/3 converts the R-Car VIN and Intel IPU3 drivers to use the new default handlers and capability flag and delete the now redundant boiler plate code. I'm sure more video device drivers can make use of this new flag but as I can only test on these two platforms I have limited my changes to those.
Niklas Söderlund (3):
v4l2-dev/ioctl: Add V4L2_CAP_IO_MC
rcar-vin: Make use of V4L2_CAP_IO_MC
staging/intel-ipu3: Make use of V4L2_CAP_IO_MC
.../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/platform/rcar-vin/rcar-v4l2.c | 17 +----- drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 ++++++++++++++++-- drivers/staging/media/ipu3/ipu3-v4l2.c | 60 +------------------ include/uapi/linux/videodev2.h | 2 + 7 files changed, 84 insertions(+), 84 deletions(-)
Signature · 1 line
2.25.1
PATCH v4 1/3 v4l2-dev/ioctl: Add V4L2_CAP_IO_MC
From: Niklas Söderlund <[email protected]>
Add a video device capability flag to indicate that its inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API. When this flag is set, ioctl for enum inputs and outputs are automatically enabled and programmed to call a helper function.
---
* Changes since v3
- Update documentation for V4L2_CAP_IO_MC
- Only enable VIDIOC_{G,S}_{INPUT,OUTPUT} if V4L2_CAP_IO_MC is set (instead of unconditionally)
- Merge v4l2_ioctl_enum_input_mc() into v4l_enuminput()
- Merge v4l2_ioctl_enum_output_mc() into v4l_enumoutput()
* Changes since v2
- Merged the two patches touching V4L2 core stuff to a single patch.
- Updated documentation for V4L2_CAP_IO_MC
- Added is_io_mc bool in determine_valid_ioctls()
- Folded or moved code closer to where it's used
- Remove unneeded memset()
- Use strscpy() instead of strlcpy()
--- .../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 +++++++++++++++++-- include/uapi/linux/videodev2.h | 2 + 5 files changed, 81 insertions(+), 10 deletions(-)
Documentation/media/uapi/v4l/vidioc-querycap.rst +6 -0
@@ -264,6 +264,12 @@ specification the ioctl returns an ``EINVAL`` error code. * - ``V4L2_CAP_TOUCH`` - 0x10000000 - This is a touch device. + * - ``V4L2_CAP_IO_MC`` + - 0x20000000 + - There is only one input and/or output seen from userspace. The whole + video topology configuration, including which I/O entity is routed to + the input/output, is configured by userspace via the Media Controller. + See :ref:`media_controller`. * - ``V4L2_CAP_DEVICE_CAPS`` - 0x80000000 - The driver fills the ``device_caps`` field. This capability can
Documentation/media/videodev2.h.rst.exceptions +1 -0
@@ -176,6 +176,7 @@ replace define V4L2_CAP_STREAMING device-capabilities replace define V4L2_CAP_META_OUTPUT device-capabilities replace define V4L2_CAP_DEVICE_CAPS device-capabilities replace define V4L2_CAP_TOUCH device-capabilities +replace define V4L2_CAP_IO_MC device-capabilities # V4L2 pix flags replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`
drivers/media/v4l2-core/v4l2-dev.c +19 -6
@@ -552,6 +552,7 @@ static void determine_valid_ioctls(struct video_device *vdev) (vdev->device_caps & meta_caps);bool is_rx = vdev->vfl_dir !=VFL_DIR_TX ;bool is_tx = vdev->vfl_dir !=VFL_DIR_RX ; +bool is_io_mc = vdev->device_caps &V4L2_CAP_IO_MC ;bitmap_zero (valid_ioctls,BASE_VIDIOC_PRIVATE );
@@ -725,9 +726,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_G_STD , vidioc_g_std);if (is_rx) {SET_VALID_IOCTL (ops,VIDIOC_QUERYSTD , vidioc_querystd); -SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); -SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); -SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMINPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_INPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_INPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); +SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); +SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDIO , vidioc_enumaudio);SET_VALID_IOCTL (ops,VIDIOC_G_AUDIO , vidioc_g_audio);SET_VALID_IOCTL (ops,VIDIOC_S_AUDIO , vidioc_s_audio);
@@ -735,9 +742,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_S_EDID , vidioc_s_edid); }if (is_tx) { -SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); -SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); -SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMOUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_OUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_OUTPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); +SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); +SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDOUT , vidioc_enumaudout);SET_VALID_IOCTL (ops,VIDIOC_G_AUDOUT , vidioc_g_audout);SET_VALID_IOCTL (ops,VIDIOC_S_AUDOUT , vidioc_s_audout);
drivers/media/v4l2-core/v4l2-ioctl.c +53 -4
104 lines not on this page · raw message
include/uapi/linux/videodev2.h +2 -0
@@ -487,6 +487,8 @@ struct v4l2_capability {#define V4L2_CAP_TOUCH 0x10000000/* Is a touch device */ +#define V4L2_CAP_IO_MC 0x20000000/* Is input/output controlled by the media controller */ +#define V4L2_CAP_DEVICE_CAPS 0x80000000/* sets device capabilities field */ /*
Signature · 1 line
2.25.1
Hi Niklas,
Thanks for the update!
Quoted 157 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Add a video device capability flag to indicate that its inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API. When this flag is set, ioctl for enum inputs and outputs are automatically enabled and programmed to call a helper function.
Suggested-by Hans Verkuil <[email protected]>Signed-off-by Helen Koike <[email protected]>Signed-off-by Niklas Söderlund <[email protected]>---
* Changes since v3
- Update documentation forV4L2_CAP_IO_MC
- Only enable VIDIOC_{G,S}_{INPUT,OUTPUT} ifV4L2_CAP_IO_MCis set (instead of unconditionally)
- Mergev4l2_ioctl_enum_input_mc()intov4l_enuminput()
- Mergev4l2_ioctl_enum_output_mc()intov4l_enumoutput()* Changes since v2
- Merged the two patches touching V4L2 core stuff to a single patch.
- Updated documentation forV4L2_CAP_IO_MC
- Addedis_io_mcbool indetermine_valid_ioctls()
- Folded or moved code closer to where it's used
- Remove unneededmemset()
- Usestrscpy()instead ofstrlcpy()--- .../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 +++++++++++++++++-- include/uapi/linux/videodev2.h | 2 + 5 files changed, 81 insertions(+), 10 deletions(-)Documentation/media/uapi/v4l/vidioc-querycap.rst +6
-0@@ -264,6 +264,12 @@ specification the ioctl returns an ``EINVAL`` error code. * - ``V4L2_CAP_TOUCH`` - 0x10000000 - This is a touch device. + * - ``V4L2_CAP_IO_MC`` + - 0x20000000 + - There is only one input and/or output seen from userspace. The whole + video topology configuration, including which I/O entity is routed to + the input/output, is configured by userspace via the Media Controller. + See :ref:`media_controller`. * - ``V4L2_CAP_DEVICE_CAPS`` - 0x80000000 - The driver fills the ``device_caps`` field. This capability canDocumentation/media/videodev2.h.rst.exceptions +1
-0@@ -176,6 +176,7 @@ replace define V4L2_CAP_STREAMING device-capabilities replace define V4L2_CAP_META_OUTPUT device-capabilities replace define V4L2_CAP_DEVICE_CAPS device-capabilities replace define V4L2_CAP_TOUCH device-capabilities +replace define V4L2_CAP_IO_MC device-capabilities # V4L2 pix flags replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`drivers/media/v4l2-core/v4l2-dev.c +19
-6@@ -552,6 +552,7 @@ static void determine_valid_ioctls(struct video_device *vdev) (vdev->device_caps & meta_caps);bool is_rx = vdev->vfl_dir !=VFL_DIR_TX ;bool is_tx = vdev->vfl_dir !=VFL_DIR_RX ; +bool is_io_mc = vdev->device_caps &V4L2_CAP_IO_MC ;bitmap_zero (valid_ioctls,BASE_VIDIOC_PRIVATE );@@ -725,9 +726,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_G_STD , vidioc_g_std);if (is_rx) {SET_VALID_IOCTL (ops,VIDIOC_QUERYSTD , vidioc_querystd); -SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); -SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); -SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMINPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_INPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_INPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); +SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); +SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDIO , vidioc_enumaudio);SET_VALID_IOCTL (ops,VIDIOC_G_AUDIO , vidioc_g_audio);SET_VALID_IOCTL (ops,VIDIOC_S_AUDIO , vidioc_s_audio);@@ -735,9 +742,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_S_EDID , vidioc_s_edid); }if (is_tx) { -SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); -SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); -SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMOUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_OUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_OUTPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); +SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); +SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDOUT , vidioc_enumaudout);SET_VALID_IOCTL (ops,VIDIOC_G_AUDOUT , vidioc_g_audout);SET_VALID_IOCTL (ops,VIDIOC_S_AUDOUT , vidioc_s_audout);drivers/media/v4l2-core/v4l2-ioctl.c +30
-0@@ -1085,6 +1085,32 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,return ret; } +static int v4l_g_input (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_input (file, fh, arg); +} + +static int v4l_g_output (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_output (file, fh, arg); +} +static int v4l_s_input (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) {@@ -1094,12 +1120,21 @@ static int v4l_s_input(const struct v4l2_ioctl_ops *ops, ret =v4l_enable_media_source (vfd);if (ret)return ret; + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ; +
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_input(const struct v4l2_ioctl_ops *ops, · line 1136
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +4
-0return ops->vidioc_s_input (file, fh, *(unsigned int *)arg); }static int v4l_s_output (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) { +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ;
The type is int, not unsigned int. The same on the rest above.
Quoted 20 lines
drivers/media/v4l2-core/v4l2-ioctl.c +9
-0+return ops->vidioc_s_output (file, fh, *(unsigned int *)arg); }@@ -1143,6 +1178,14 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_IN_CAP_STD ; +if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_INPUT_TYPE_CAMERA ; +return 0 ; + } +return ops->vidioc_enum_input (file, fh, p); }
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops, · line 1211
Quoted 8 lines
drivers/media/v4l2-core/v4l2-ioctl.c +5
-0@@ -1161,6 +1204,14 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_OUT_CAP_STD ; +if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_OUTPUT_TYPE_ANALOG ;
How about adding a new INPUT and OUTPUT types just for IO_MC device cap?
This isn't necessarily a camera nor analogue output...
With these,
Quoted 44 lines
drivers/media/v4l2-core/v4l2-ioctl.c +5
-4+return 0 ; + } +return ops->vidioc_enum_output (file, fh, p); }@@ -2678,10 +2729,8 @@ DEFINE_V4L_STUB_FUNC(expbuf) DEFINE_V4L_STUB_FUNC(g_std) DEFINE_V4L_STUB_FUNC(g_audio) DEFINE_V4L_STUB_FUNC(s_audio) -DEFINE_V4L_STUB_FUNC(g_input) DEFINE_V4L_STUB_FUNC(g_edid) DEFINE_V4L_STUB_FUNC(s_edid) -DEFINE_V4L_STUB_FUNC(g_output) DEFINE_V4L_STUB_FUNC(g_audout) DEFINE_V4L_STUB_FUNC(s_audout) DEFINE_V4L_STUB_FUNC(g_jpegcomp)@@ -2730,11 +2779,11 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {IOCTL_INFO (VIDIOC_S_AUDIO , v4l_stub_s_audio, v4l_print_audio,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_QUERYCTRL , v4l_queryctrl, v4l_print_queryctrl,INFO_FL_CTRL |INFO_FL_CLEAR (v4l2_queryctrl, id)),IOCTL_INFO (VIDIOC_QUERYMENU , v4l_querymenu, v4l_print_querymenu,INFO_FL_CTRL |INFO_FL_CLEAR (v4l2_querymenu, index)), -IOCTL_INFO (VIDIOC_G_INPUT , v4l_stub_g_input, v4l_print_u32,0 ), +IOCTL_INFO (VIDIOC_G_INPUT , v4l_g_input, v4l_print_u32,0 ),IOCTL_INFO (VIDIOC_S_INPUT , v4l_s_input, v4l_print_u32,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_G_EDID , v4l_stub_g_edid, v4l_print_edid,INFO_FL_ALWAYS_COPY ),IOCTL_INFO (VIDIOC_S_EDID , v4l_stub_s_edid, v4l_print_edid,INFO_FL_PRIO |INFO_FL_ALWAYS_COPY ), -IOCTL_INFO (VIDIOC_G_OUTPUT , v4l_stub_g_output, v4l_print_u32,0 ), +IOCTL_INFO (VIDIOC_G_OUTPUT , v4l_g_output, v4l_print_u32,0 ),IOCTL_INFO (VIDIOC_S_OUTPUT , v4l_s_output, v4l_print_u32,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_ENUMOUTPUT , v4l_enumoutput, v4l_print_enumoutput,INFO_FL_CLEAR (v4l2_output, index)), IOCTL_INFO(VIDIOC_G_AUDOUT, v4l_stub_g_audout, v4l_print_audioout, 0),include/uapi/linux/videodev2.h +2
-0@@ -487,6 +487,8 @@ struct v4l2_capability {#define V4L2_CAP_TOUCH 0x10000000/* Is a touch device */ +#define V4L2_CAP_IO_MC 0x20000000/* Is input/output controlled by the media controller */ +#define V4L2_CAP_DEVICE_CAPS 0x80000000/* sets device capabilities field */ /*
Signature · 3 lines
Kind regards, Sakari Ailus
Quoted 198 lines · Sakari Ailus
Hi Niklas,
Thanks for the update!
Quoted 157 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Add a video device capability flag to indicate that its inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API. When this flag is set, ioctl for enum inputs and outputs are automatically enabled and programmed to call a helper function.
Suggested-by Hans Verkuil <[email protected]>Signed-off-by Helen Koike <[email protected]>Signed-off-by Niklas Söderlund <[email protected]>---
* Changes since v3
- Update documentation forV4L2_CAP_IO_MC
- Only enable VIDIOC_{G,S}_{INPUT,OUTPUT} ifV4L2_CAP_IO_MCis set (instead of unconditionally)
- Mergev4l2_ioctl_enum_input_mc()intov4l_enuminput()
- Mergev4l2_ioctl_enum_output_mc()intov4l_enumoutput()* Changes since v2
- Merged the two patches touching V4L2 core stuff to a single patch.
- Updated documentation forV4L2_CAP_IO_MC
- Addedis_io_mcbool indetermine_valid_ioctls()
- Folded or moved code closer to where it's used
- Remove unneededmemset()
- Usestrscpy()instead ofstrlcpy()--- .../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 +++++++++++++++++-- include/uapi/linux/videodev2.h | 2 + 5 files changed, 81 insertions(+), 10 deletions(-)Documentation/media/uapi/v4l/vidioc-querycap.rst +6
-0@@ -264,6 +264,12 @@ specification the ioctl returns an ``EINVAL`` error code. * - ``V4L2_CAP_TOUCH`` - 0x10000000 - This is a touch device. + * - ``V4L2_CAP_IO_MC`` + - 0x20000000 + - There is only one input and/or output seen from userspace. The whole + video topology configuration, including which I/O entity is routed to + the input/output, is configured by userspace via the Media Controller. + See :ref:`media_controller`. * - ``V4L2_CAP_DEVICE_CAPS`` - 0x80000000 - The driver fills the ``device_caps`` field. This capability canDocumentation/media/videodev2.h.rst.exceptions +1
-0@@ -176,6 +176,7 @@ replace define V4L2_CAP_STREAMING device-capabilities replace define V4L2_CAP_META_OUTPUT device-capabilities replace define V4L2_CAP_DEVICE_CAPS device-capabilities replace define V4L2_CAP_TOUCH device-capabilities +replace define V4L2_CAP_IO_MC device-capabilities # V4L2 pix flags replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`drivers/media/v4l2-core/v4l2-dev.c +19
-6@@ -552,6 +552,7 @@ static void determine_valid_ioctls(struct video_device *vdev) (vdev->device_caps & meta_caps);bool is_rx = vdev->vfl_dir !=VFL_DIR_TX ;bool is_tx = vdev->vfl_dir !=VFL_DIR_RX ; +bool is_io_mc = vdev->device_caps &V4L2_CAP_IO_MC ;bitmap_zero (valid_ioctls,BASE_VIDIOC_PRIVATE );@@ -725,9 +726,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_G_STD , vidioc_g_std);if (is_rx) {SET_VALID_IOCTL (ops,VIDIOC_QUERYSTD , vidioc_querystd); -SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); -SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); -SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMINPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_INPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_INPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); +SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); +SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDIO , vidioc_enumaudio);SET_VALID_IOCTL (ops,VIDIOC_G_AUDIO , vidioc_g_audio);SET_VALID_IOCTL (ops,VIDIOC_S_AUDIO , vidioc_s_audio);@@ -735,9 +742,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_S_EDID , vidioc_s_edid); }if (is_tx) { -SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); -SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); -SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMOUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_OUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_OUTPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); +SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); +SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDOUT , vidioc_enumaudout);SET_VALID_IOCTL (ops,VIDIOC_G_AUDOUT , vidioc_g_audout);SET_VALID_IOCTL (ops,VIDIOC_S_AUDOUT , vidioc_s_audout);drivers/media/v4l2-core/v4l2-ioctl.c +30
-0@@ -1085,6 +1085,32 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,return ret; } +static int v4l_g_input (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_input (file, fh, arg); +} + +static int v4l_g_output (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_output (file, fh, arg); +} +static int v4l_s_input (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) {@@ -1094,12 +1120,21 @@ static int v4l_s_input(const struct v4l2_ioctl_ops *ops, ret =v4l_enable_media_source (vfd);if (ret)return ret; + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ; +drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_input(const struct v4l2_ioctl_ops *ops, · line 1136
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +4
-0return ops->vidioc_s_input (file, fh, *(unsigned int *)arg); }static int v4l_s_output (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) { +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ;The type is int, not unsigned int. The same on the rest above.
Quoted 23 lines
drivers/media/v4l2-core/v4l2-ioctl.c +9
-0+return ops->vidioc_s_output (file, fh, *(unsigned int *)arg); }@@ -1143,6 +1178,14 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_IN_CAP_STD ; +if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_INPUT_TYPE_CAMERA ; +return 0 ; + } +return ops->vidioc_enum_input (file, fh, p); }@@ -1161,6 +1204,14 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_OUT_CAP_STD ;
Quoted 7 lines
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops, · line 1211
Quoted 5 lines
drivers/media/v4l2-core/v4l2-ioctl.c +5
-0+if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_OUTPUT_TYPE_ANALOG ;How about adding a new INPUT and OUTPUT types just for
IO_MCdevice cap?
V4L2_OUTPUT_TYPE_ANALOG is an old term that is in practice used for anything video, except for TV modulators. I'm all in favor of changing this to:
#define V4L2_OUTPUT_TYPE_VIDEO 2
#ifndef __KERNEL__
#define V4L2_OUTPUT_TYPE_ANALOG V4L2_OUTPUT_TYPE_VIDEO #endif
in videodev2.h, if others agree with that. But that can be done in a separate follow-up patch since this needs to be adapted throughout the kernel & documentation.
The same is true for V4L2_INPUT_TYPE_CAMERA: in practice it's used for any video, except TV tuners.
Regards,
Hans
Quoted 52 lines
This isn't necessarily a camera nor analogue output...
With these,
Acked-by Sakari Ailus <[email protected]>Quoted 44 lines
drivers/media/v4l2-core/v4l2-ioctl.c +5
-4+return 0 ; + } +return ops->vidioc_enum_output (file, fh, p); }@@ -2678,10 +2729,8 @@ DEFINE_V4L_STUB_FUNC(expbuf) DEFINE_V4L_STUB_FUNC(g_std) DEFINE_V4L_STUB_FUNC(g_audio) DEFINE_V4L_STUB_FUNC(s_audio) -DEFINE_V4L_STUB_FUNC(g_input) DEFINE_V4L_STUB_FUNC(g_edid) DEFINE_V4L_STUB_FUNC(s_edid) -DEFINE_V4L_STUB_FUNC(g_output) DEFINE_V4L_STUB_FUNC(g_audout) DEFINE_V4L_STUB_FUNC(s_audout) DEFINE_V4L_STUB_FUNC(g_jpegcomp)@@ -2730,11 +2779,11 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {IOCTL_INFO (VIDIOC_S_AUDIO , v4l_stub_s_audio, v4l_print_audio,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_QUERYCTRL , v4l_queryctrl, v4l_print_queryctrl,INFO_FL_CTRL |INFO_FL_CLEAR (v4l2_queryctrl, id)),IOCTL_INFO (VIDIOC_QUERYMENU , v4l_querymenu, v4l_print_querymenu,INFO_FL_CTRL |INFO_FL_CLEAR (v4l2_querymenu, index)), -IOCTL_INFO (VIDIOC_G_INPUT , v4l_stub_g_input, v4l_print_u32,0 ), +IOCTL_INFO (VIDIOC_G_INPUT , v4l_g_input, v4l_print_u32,0 ),IOCTL_INFO (VIDIOC_S_INPUT , v4l_s_input, v4l_print_u32,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_G_EDID , v4l_stub_g_edid, v4l_print_edid,INFO_FL_ALWAYS_COPY ),IOCTL_INFO (VIDIOC_S_EDID , v4l_stub_s_edid, v4l_print_edid,INFO_FL_PRIO |INFO_FL_ALWAYS_COPY ), -IOCTL_INFO (VIDIOC_G_OUTPUT , v4l_stub_g_output, v4l_print_u32,0 ), +IOCTL_INFO (VIDIOC_G_OUTPUT , v4l_g_output, v4l_print_u32,0 ),IOCTL_INFO (VIDIOC_S_OUTPUT , v4l_s_output, v4l_print_u32,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_ENUMOUTPUT , v4l_enumoutput, v4l_print_enumoutput,INFO_FL_CLEAR (v4l2_output, index)), IOCTL_INFO(VIDIOC_G_AUDOUT, v4l_stub_g_audout, v4l_print_audioout, 0),include/uapi/linux/videodev2.h +2
-0@@ -487,6 +487,8 @@ struct v4l2_capability {#define V4L2_CAP_TOUCH 0x10000000/* Is a touch device */ +#define V4L2_CAP_IO_MC 0x20000000/* Is input/output controlled by the media controller */ +#define V4L2_CAP_DEVICE_CAPS 0x80000000/* sets device capabilities field */ /*
Sakari Ailus
maintainerHi Hans,
Quoted 215 lines · Hans Verkuil
Quoted 198 lines · Sakari Ailus
Hi Niklas,
Thanks for the update!
Quoted 157 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Add a video device capability flag to indicate that its inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API. When this flag is set, ioctl for enum inputs and outputs are automatically enabled and programmed to call a helper function.
Suggested-by Hans Verkuil <[email protected]>Signed-off-by Helen Koike <[email protected]>Signed-off-by Niklas Söderlund <[email protected]>---
* Changes since v3
- Update documentation forV4L2_CAP_IO_MC
- Only enable VIDIOC_{G,S}_{INPUT,OUTPUT} ifV4L2_CAP_IO_MCis set (instead of unconditionally)
- Mergev4l2_ioctl_enum_input_mc()intov4l_enuminput()
- Mergev4l2_ioctl_enum_output_mc()intov4l_enumoutput()* Changes since v2
- Merged the two patches touching V4L2 core stuff to a single patch.
- Updated documentation forV4L2_CAP_IO_MC
- Addedis_io_mcbool indetermine_valid_ioctls()
- Folded or moved code closer to where it's used
- Remove unneededmemset()
- Usestrscpy()instead ofstrlcpy()--- .../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 +++++++++++++++++-- include/uapi/linux/videodev2.h | 2 + 5 files changed, 81 insertions(+), 10 deletions(-)Documentation/media/uapi/v4l/vidioc-querycap.rst +6
-0@@ -264,6 +264,12 @@ specification the ioctl returns an ``EINVAL`` error code. * - ``V4L2_CAP_TOUCH`` - 0x10000000 - This is a touch device. + * - ``V4L2_CAP_IO_MC`` + - 0x20000000 + - There is only one input and/or output seen from userspace. The whole + video topology configuration, including which I/O entity is routed to + the input/output, is configured by userspace via the Media Controller. + See :ref:`media_controller`. * - ``V4L2_CAP_DEVICE_CAPS`` - 0x80000000 - The driver fills the ``device_caps`` field. This capability canDocumentation/media/videodev2.h.rst.exceptions +1
-0@@ -176,6 +176,7 @@ replace define V4L2_CAP_STREAMING device-capabilities replace define V4L2_CAP_META_OUTPUT device-capabilities replace define V4L2_CAP_DEVICE_CAPS device-capabilities replace define V4L2_CAP_TOUCH device-capabilities +replace define V4L2_CAP_IO_MC device-capabilities # V4L2 pix flags replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`drivers/media/v4l2-core/v4l2-dev.c +19
-6@@ -552,6 +552,7 @@ static void determine_valid_ioctls(struct video_device *vdev) (vdev->device_caps & meta_caps);bool is_rx = vdev->vfl_dir !=VFL_DIR_TX ;bool is_tx = vdev->vfl_dir !=VFL_DIR_RX ; +bool is_io_mc = vdev->device_caps &V4L2_CAP_IO_MC ;bitmap_zero (valid_ioctls,BASE_VIDIOC_PRIVATE );@@ -725,9 +726,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_G_STD , vidioc_g_std);if (is_rx) {SET_VALID_IOCTL (ops,VIDIOC_QUERYSTD , vidioc_querystd); -SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); -SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); -SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMINPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_INPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_INPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); +SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); +SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDIO , vidioc_enumaudio);SET_VALID_IOCTL (ops,VIDIOC_G_AUDIO , vidioc_g_audio);SET_VALID_IOCTL (ops,VIDIOC_S_AUDIO , vidioc_s_audio);@@ -735,9 +742,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_S_EDID , vidioc_s_edid); }if (is_tx) { -SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); -SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); -SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMOUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_OUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_OUTPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); +SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); +SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDOUT , vidioc_enumaudout);SET_VALID_IOCTL (ops,VIDIOC_G_AUDOUT , vidioc_g_audout);SET_VALID_IOCTL (ops,VIDIOC_S_AUDOUT , vidioc_s_audout);drivers/media/v4l2-core/v4l2-ioctl.c +30
-0@@ -1085,6 +1085,32 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,return ret; } +static int v4l_g_input (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_input (file, fh, arg); +} + +static int v4l_g_output (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_output (file, fh, arg); +} +static int v4l_s_input (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) {@@ -1094,12 +1120,21 @@ static int v4l_s_input(const struct v4l2_ioctl_ops *ops, ret =v4l_enable_media_source (vfd);if (ret)return ret; + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ; +drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_input(const struct v4l2_ioctl_ops *ops, · line 1136
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +4
-0return ops->vidioc_s_input (file, fh, *(unsigned int *)arg); }static int v4l_s_output (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) { +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ;The type is int, not unsigned int. The same on the rest above.
Quoted 23 lines
drivers/media/v4l2-core/v4l2-ioctl.c +9
-0+return ops->vidioc_s_output (file, fh, *(unsigned int *)arg); }@@ -1143,6 +1178,14 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_IN_CAP_STD ; +if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_INPUT_TYPE_CAMERA ; +return 0 ; + } +return ops->vidioc_enum_input (file, fh, p); }@@ -1161,6 +1204,14 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_OUT_CAP_STD ;Quoted 7 lines
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops, · line 1211
Quoted 5 lines
drivers/media/v4l2-core/v4l2-ioctl.c +5
-0+if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_OUTPUT_TYPE_ANALOG ;How about adding a new INPUT and OUTPUT types just for
IO_MCdevice cap?
V4L2_OUTPUT_TYPE_ANALOGis an old term that is in practice used for anything video, except for TV modulators. I'm all in favor of changing this to:#define
V4L2_OUTPUT_TYPE_VIDEO2
#ifndef__KERNEL__
#defineV4L2_OUTPUT_TYPE_ANALOGV4L2_OUTPUT_TYPE_VIDEO#endif
Quoted 5 lines
in
videodev2.h, if others agree with that. But that can be done in a separate follow-up patch since this needs to be adapted throughout the kernel & documentation.The same is true for
V4L2_INPUT_TYPE_CAMERA: in practice it's used for any video, except TV tuners.
My point was rather that here, we don't know what kind of device really is the source (or the sink) of the data path. Having a designated input and output type for that would be entirely appropriate.
Although if the user gets a misleading value using an interface that (s)he's not supposed to use to begin with, I guess I'd fine with that as well.
Signature · 3 lines
Regards, Sakari Ailus
Quoted 221 lines · Sakari Ailus
Hi Hans,
Quoted 218 lines · Hans Verkuil
Quoted 198 lines · Sakari Ailus
Hi Niklas,
Thanks for the update!
Quoted 157 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Add a video device capability flag to indicate that its inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API. When this flag is set, ioctl for enum inputs and outputs are automatically enabled and programmed to call a helper function.
Suggested-by Hans Verkuil <[email protected]>Signed-off-by Helen Koike <[email protected]>Signed-off-by Niklas Söderlund <[email protected]>---
* Changes since v3
- Update documentation forV4L2_CAP_IO_MC
- Only enable VIDIOC_{G,S}_{INPUT,OUTPUT} ifV4L2_CAP_IO_MCis set (instead of unconditionally)
- Mergev4l2_ioctl_enum_input_mc()intov4l_enuminput()
- Mergev4l2_ioctl_enum_output_mc()intov4l_enumoutput()* Changes since v2
- Merged the two patches touching V4L2 core stuff to a single patch.
- Updated documentation forV4L2_CAP_IO_MC
- Addedis_io_mcbool indetermine_valid_ioctls()
- Folded or moved code closer to where it's used
- Remove unneededmemset()
- Usestrscpy()instead ofstrlcpy()--- .../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 +++++++++++++++++-- include/uapi/linux/videodev2.h | 2 + 5 files changed, 81 insertions(+), 10 deletions(-)Documentation/media/uapi/v4l/vidioc-querycap.rst +6
-0@@ -264,6 +264,12 @@ specification the ioctl returns an ``EINVAL`` error code. * - ``V4L2_CAP_TOUCH`` - 0x10000000 - This is a touch device. + * - ``V4L2_CAP_IO_MC`` + - 0x20000000 + - There is only one input and/or output seen from userspace. The whole + video topology configuration, including which I/O entity is routed to + the input/output, is configured by userspace via the Media Controller. + See :ref:`media_controller`. * - ``V4L2_CAP_DEVICE_CAPS`` - 0x80000000 - The driver fills the ``device_caps`` field. This capability canDocumentation/media/videodev2.h.rst.exceptions +1
-0@@ -176,6 +176,7 @@ replace define V4L2_CAP_STREAMING device-capabilities replace define V4L2_CAP_META_OUTPUT device-capabilities replace define V4L2_CAP_DEVICE_CAPS device-capabilities replace define V4L2_CAP_TOUCH device-capabilities +replace define V4L2_CAP_IO_MC device-capabilities # V4L2 pix flags replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`drivers/media/v4l2-core/v4l2-dev.c +19
-6@@ -552,6 +552,7 @@ static void determine_valid_ioctls(struct video_device *vdev) (vdev->device_caps & meta_caps);bool is_rx = vdev->vfl_dir !=VFL_DIR_TX ;bool is_tx = vdev->vfl_dir !=VFL_DIR_RX ; +bool is_io_mc = vdev->device_caps &V4L2_CAP_IO_MC ;bitmap_zero (valid_ioctls,BASE_VIDIOC_PRIVATE );@@ -725,9 +726,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_G_STD , vidioc_g_std);if (is_rx) {SET_VALID_IOCTL (ops,VIDIOC_QUERYSTD , vidioc_querystd); -SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); -SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); -SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMINPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_INPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_INPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); +SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); +SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDIO , vidioc_enumaudio);SET_VALID_IOCTL (ops,VIDIOC_G_AUDIO , vidioc_g_audio);SET_VALID_IOCTL (ops,VIDIOC_S_AUDIO , vidioc_s_audio);@@ -735,9 +742,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_S_EDID , vidioc_s_edid); }if (is_tx) { -SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); -SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); -SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMOUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_OUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_OUTPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); +SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); +SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDOUT , vidioc_enumaudout);SET_VALID_IOCTL (ops,VIDIOC_G_AUDOUT , vidioc_g_audout);SET_VALID_IOCTL (ops,VIDIOC_S_AUDOUT , vidioc_s_audout);drivers/media/v4l2-core/v4l2-ioctl.c +30
-0@@ -1085,6 +1085,32 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,return ret; } +static int v4l_g_input (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_input (file, fh, arg); +} + +static int v4l_g_output (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_output (file, fh, arg); +} +static int v4l_s_input (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) {@@ -1094,12 +1120,21 @@ static int v4l_s_input(const struct v4l2_ioctl_ops *ops, ret =v4l_enable_media_source (vfd);if (ret)return ret; + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ; +drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_input(const struct v4l2_ioctl_ops *ops, · line 1136
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +4
-0return ops->vidioc_s_input (file, fh, *(unsigned int *)arg); }static int v4l_s_output (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) { +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ;The type is int, not unsigned int. The same on the rest above.
Quoted 23 lines
drivers/media/v4l2-core/v4l2-ioctl.c +9
-0+return ops->vidioc_s_output (file, fh, *(unsigned int *)arg); }@@ -1143,6 +1178,14 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_IN_CAP_STD ; +if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_INPUT_TYPE_CAMERA ; +return 0 ; + } +return ops->vidioc_enum_input (file, fh, p); }@@ -1161,6 +1204,14 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_OUT_CAP_STD ;Quoted 7 lines
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops, · line 1211
Quoted 5 lines
drivers/media/v4l2-core/v4l2-ioctl.c +5
-0+if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_OUTPUT_TYPE_ANALOG ;How about adding a new INPUT and OUTPUT types just for
IO_MCdevice cap?
V4L2_OUTPUT_TYPE_ANALOGis an old term that is in practice used for anything video, except for TV modulators. I'm all in favor of changing this to:#define
V4L2_OUTPUT_TYPE_VIDEO2
#ifndef__KERNEL__
#defineV4L2_OUTPUT_TYPE_ANALOGV4L2_OUTPUT_TYPE_VIDEO#endifin
videodev2.h, if others agree with that. But that can be done in a separate follow-up patch since this needs to be adapted throughout the kernel & documentation.
Quoted 6 lines
Quoted 2 lines
The same is true for
V4L2_INPUT_TYPE_CAMERA: in practice it's used for any video, except TV tuners.My point was rather that here, we don't know what kind of device really is the source (or the sink) of the data path. Having a designated input and output type for that would be entirely appropriate.
But that's exactly what V4L2_OUTPUT_TYPE_ANALOG/V4L2_INPUT_TYPE_CAMERA means:
it's some kind of video, but we don't know what.
That's why these names are so misleading: they suggest a particular type, but in reality they don't.
So V4L2_IN/OUTPUT_TYPE_VIDEO is what you want for MC inputs/outputs, but that's just an alias for V4L2_INPUT_TYPE_CAMERA/V4L2_OUTPUT_TYPE_ANALOG.
Regards,
Hans
Quoted 5 lines
Although if the user gets a misleading value using an interface that (s)he's not supposed to use to begin with, I guess I'd fine with that as well.
Sakari Ailus
maintainerQuoted 225 lines · Hans Verkuil
Quoted 224 lines · Sakari Ailus
Hi Hans,
Quoted 220 lines · Hans Verkuil
Quoted 198 lines · Sakari Ailus
Hi Niklas,
Thanks for the update!
Quoted 157 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Add a video device capability flag to indicate that its inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API. When this flag is set, ioctl for enum inputs and outputs are automatically enabled and programmed to call a helper function.
Suggested-by Hans Verkuil <[email protected]>Signed-off-by Helen Koike <[email protected]>Signed-off-by Niklas Söderlund <[email protected]>---
* Changes since v3
- Update documentation forV4L2_CAP_IO_MC
- Only enable VIDIOC_{G,S}_{INPUT,OUTPUT} ifV4L2_CAP_IO_MCis set (instead of unconditionally)
- Mergev4l2_ioctl_enum_input_mc()intov4l_enuminput()
- Mergev4l2_ioctl_enum_output_mc()intov4l_enumoutput()* Changes since v2
- Merged the two patches touching V4L2 core stuff to a single patch.
- Updated documentation forV4L2_CAP_IO_MC
- Addedis_io_mcbool indetermine_valid_ioctls()
- Folded or moved code closer to where it's used
- Remove unneededmemset()
- Usestrscpy()instead ofstrlcpy()--- .../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 +++++++++++++++++-- include/uapi/linux/videodev2.h | 2 + 5 files changed, 81 insertions(+), 10 deletions(-)Documentation/media/uapi/v4l/vidioc-querycap.rst +6
-0@@ -264,6 +264,12 @@ specification the ioctl returns an ``EINVAL`` error code. * - ``V4L2_CAP_TOUCH`` - 0x10000000 - This is a touch device. + * - ``V4L2_CAP_IO_MC`` + - 0x20000000 + - There is only one input and/or output seen from userspace. The whole + video topology configuration, including which I/O entity is routed to + the input/output, is configured by userspace via the Media Controller. + See :ref:`media_controller`. * - ``V4L2_CAP_DEVICE_CAPS`` - 0x80000000 - The driver fills the ``device_caps`` field. This capability canDocumentation/media/videodev2.h.rst.exceptions +1
-0@@ -176,6 +176,7 @@ replace define V4L2_CAP_STREAMING device-capabilities replace define V4L2_CAP_META_OUTPUT device-capabilities replace define V4L2_CAP_DEVICE_CAPS device-capabilities replace define V4L2_CAP_TOUCH device-capabilities +replace define V4L2_CAP_IO_MC device-capabilities # V4L2 pix flags replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`drivers/media/v4l2-core/v4l2-dev.c +19
-6@@ -552,6 +552,7 @@ static void determine_valid_ioctls(struct video_device *vdev) (vdev->device_caps & meta_caps);bool is_rx = vdev->vfl_dir !=VFL_DIR_TX ;bool is_tx = vdev->vfl_dir !=VFL_DIR_RX ; +bool is_io_mc = vdev->device_caps &V4L2_CAP_IO_MC ;bitmap_zero (valid_ioctls,BASE_VIDIOC_PRIVATE );@@ -725,9 +726,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_G_STD , vidioc_g_std);if (is_rx) {SET_VALID_IOCTL (ops,VIDIOC_QUERYSTD , vidioc_querystd); -SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); -SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); -SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMINPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_INPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_INPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); +SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); +SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDIO , vidioc_enumaudio);SET_VALID_IOCTL (ops,VIDIOC_G_AUDIO , vidioc_g_audio);SET_VALID_IOCTL (ops,VIDIOC_S_AUDIO , vidioc_s_audio);@@ -735,9 +742,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_S_EDID , vidioc_s_edid); }if (is_tx) { -SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); -SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); -SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMOUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_OUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_OUTPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); +SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); +SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDOUT , vidioc_enumaudout);SET_VALID_IOCTL (ops,VIDIOC_G_AUDOUT , vidioc_g_audout);SET_VALID_IOCTL (ops,VIDIOC_S_AUDOUT , vidioc_s_audout);drivers/media/v4l2-core/v4l2-ioctl.c +30
-0@@ -1085,6 +1085,32 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,return ret; } +static int v4l_g_input (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_input (file, fh, arg); +} + +static int v4l_g_output (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_output (file, fh, arg); +} +static int v4l_s_input (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) {@@ -1094,12 +1120,21 @@ static int v4l_s_input(const struct v4l2_ioctl_ops *ops, ret =v4l_enable_media_source (vfd);if (ret)return ret; + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ; +drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_s_input(const struct v4l2_ioctl_ops *ops, · line 1136
Quoted 10 lines
drivers/media/v4l2-core/v4l2-ioctl.c +4
-0return ops->vidioc_s_input (file, fh, *(unsigned int *)arg); }static int v4l_s_output (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) { +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ;The type is int, not unsigned int. The same on the rest above.
Quoted 23 lines
drivers/media/v4l2-core/v4l2-ioctl.c +9
-0+return ops->vidioc_s_output (file, fh, *(unsigned int *)arg); }@@ -1143,6 +1178,14 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_IN_CAP_STD ; +if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_INPUT_TYPE_CAMERA ; +return 0 ; + } +return ops->vidioc_enum_input (file, fh, p); }@@ -1161,6 +1204,14 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_OUT_CAP_STD ;Quoted 7 lines
drivers/media/v4l2-core/v4l2-ioctl.c static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops, · line 1211
Quoted 5 lines
drivers/media/v4l2-core/v4l2-ioctl.c +5
-0+if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_OUTPUT_TYPE_ANALOG ;How about adding a new INPUT and OUTPUT types just for
IO_MCdevice cap?
V4L2_OUTPUT_TYPE_ANALOGis an old term that is in practice used for anything video, except for TV modulators. I'm all in favor of changing this to:#define
V4L2_OUTPUT_TYPE_VIDEO2
#ifndef__KERNEL__
#defineV4L2_OUTPUT_TYPE_ANALOGV4L2_OUTPUT_TYPE_VIDEO#endifin
videodev2.h, if others agree with that. But that can be done in a separate follow-up patch since this needs to be adapted throughout the kernel & documentation.The same is true for
V4L2_INPUT_TYPE_CAMERA: in practice it's used for any video, except TV tuners.
Quoted 6 lines
Quoted 3 lines
My point was rather that here, we don't know what kind of device really is the source (or the sink) of the data path. Having a designated input and output type for that would be entirely appropriate.
But that's exactly what V4L2_OUTPUT_TYPE_ANALOG/V4L2_INPUT_TYPE_CAMERA means:
it's some kind of video, but we don't know what.
The documentation says only that:
Any non-modulator video output, for example Composite Video, S-Video, HDMI. The naming as ``_TYPE_ANALOG`` is historical, today we would have called it ``_TYPE_VIDEO``.
Quoted 6 lines
That's why these names are so misleading: they suggest a particular type, but in reality they don't.
So V4L2_IN/OUTPUT_TYPE_VIDEO is what you want for MC inputs/outputs, but that's just an alias for V4L2_INPUT_TYPE_CAMERA/V4L2_OUTPUT_TYPE_ANALOG.
Fine for me then.
Signature · 3 lines
Regards, Sakari Ailus
Sakari Ailus
maintainerHi Niklas,
Quoted 75 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Add a video device capability flag to indicate that its inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API. When this flag is set, ioctl for enum inputs and outputs are automatically enabled and programmed to call a helper function.
Suggested-by Hans Verkuil <[email protected]>Signed-off-by Helen Koike <[email protected]>Signed-off-by Niklas Söderlund <[email protected]>---
* Changes since v3
- Update documentation forV4L2_CAP_IO_MC
- Only enable VIDIOC_{G,S}_{INPUT,OUTPUT} ifV4L2_CAP_IO_MCis set (instead of unconditionally)
- Mergev4l2_ioctl_enum_input_mc()intov4l_enuminput()
- Mergev4l2_ioctl_enum_output_mc()intov4l_enumoutput()* Changes since v2
- Merged the two patches touching V4L2 core stuff to a single patch.
- Updated documentation forV4L2_CAP_IO_MC
- Addedis_io_mcbool indetermine_valid_ioctls()
- Folded or moved code closer to where it's used
- Remove unneededmemset()
- Usestrscpy()instead ofstrlcpy()--- .../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 +++++++++++++++++-- include/uapi/linux/videodev2.h | 2 + 5 files changed, 81 insertions(+), 10 deletions(-)Documentation/media/uapi/v4l/vidioc-querycap.rst +6
-0@@ -264,6 +264,12 @@ specification the ioctl returns an ``EINVAL`` error code. * - ``V4L2_CAP_TOUCH`` - 0x10000000 - This is a touch device. + * - ``V4L2_CAP_IO_MC`` + - 0x20000000 + - There is only one input and/or output seen from userspace. The whole + video topology configuration, including which I/O entity is routed to + the input/output, is configured by userspace via the Media Controller. + See :ref:`media_controller`. * - ``V4L2_CAP_DEVICE_CAPS`` - 0x80000000 - The driver fills the ``device_caps`` field. This capability canDocumentation/media/videodev2.h.rst.exceptions +1
-0@@ -176,6 +176,7 @@ replace define V4L2_CAP_STREAMING device-capabilities replace define V4L2_CAP_META_OUTPUT device-capabilities replace define V4L2_CAP_DEVICE_CAPS device-capabilities replace define V4L2_CAP_TOUCH device-capabilities +replace define V4L2_CAP_IO_MC device-capabilities # V4L2 pix flags replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`drivers/media/v4l2-core/v4l2-dev.c +1
-0@@ -552,6 +552,7 @@ static void determine_valid_ioctls(struct video_device *vdev) (vdev->device_caps & meta_caps);bool is_rx = vdev->vfl_dir !=VFL_DIR_TX ;bool is_tx = vdev->vfl_dir !=VFL_DIR_RX ; +bool is_io_mc = vdev->device_caps &V4L2_CAP_IO_MC ;bitmap_zero (valid_ioctls,BASE_VIDIOC_PRIVATE );
drivers/media/v4l2-core/v4l2-dev.c static void determine_valid_ioctls(struct video_device *vdev) · line 729
Quoted 7 lines
drivers/media/v4l2-core/v4l2-dev.c +1
-3@@ -725,9 +726,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_G_STD , vidioc_g_std);if (is_rx) {SET_VALID_IOCTL (ops,VIDIOC_QUERYSTD , vidioc_querystd); -SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); -SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); -SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); +if (is_io_mc) {
One more comment.
I'd make this dependent on the device node type, i.e. devices with meta_caps set, the IOCTLs won't be supported.
So the check would become:
if (is_io_mc && !is_meta)
Quoted 11 lines
drivers/media/v4l2-core/v4l2-dev.c +8
-0+set_bit (_IOC_NR (VIDIOC_ENUMINPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_INPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_INPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); +SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); +SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDIO , vidioc_enumaudio);SET_VALID_IOCTL (ops,VIDIOC_G_AUDIO , vidioc_g_audio);SET_VALID_IOCTL (ops,VIDIOC_S_AUDIO , vidioc_s_audio);
Signature · 1 line
Sakari Ailus
Hi Niklas,
Thank you for the patch.
Quoted 38 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Add a video device capability flag to indicate that its inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API. When this flag is set, ioctl for enum inputs and outputs are automatically enabled and programmed to call a helper function.
Suggested-by Hans Verkuil <[email protected]>Signed-off-by Helen Koike <[email protected]>Signed-off-by Niklas Söderlund <[email protected]>---
* Changes since v3
- Update documentation forV4L2_CAP_IO_MC
- Only enable VIDIOC_{G,S}_{INPUT,OUTPUT} ifV4L2_CAP_IO_MCis set (instead of unconditionally)
- Mergev4l2_ioctl_enum_input_mc()intov4l_enuminput()
- Mergev4l2_ioctl_enum_output_mc()intov4l_enumoutput()* Changes since v2
- Merged the two patches touching V4L2 core stuff to a single patch.
- Updated documentation forV4L2_CAP_IO_MC
- Addedis_io_mcbool indetermine_valid_ioctls()
- Folded or moved code closer to where it's used
- Remove unneededmemset()
- Usestrscpy()instead ofstrlcpy()--- .../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 +++++++++++++++++-- include/uapi/linux/videodev2.h | 2 + 5 files changed, 81 insertions(+), 10 deletions(-)Documentation/media/uapi/v4l/vidioc-querycap.rst +0
-0
Documentation/media/uapi/v4l/vidioc-querycap.rst specification the ioctl returns an ``EINVAL`` error code. · line 271
Quoted 8 lines
Documentation/media/uapi/v4l/vidioc-querycap.rst +5
-0@@ -264,6 +264,12 @@ specification the ioctl returns an ``EINVAL`` error code. * - ``V4L2_CAP_TOUCH`` - 0x10000000 - This is a touch device. + * - ``V4L2_CAP_IO_MC`` + - 0x20000000 + - There is only one input and/or output seen from userspace. The whole + video topology configuration, including which I/O entity is routed to + the input/output, is configured by userspace via the Media Controller.
I would have disabled those ioctls instead, as they're completely useless. Now that there's a V4L2_CAP_IO_MC flag, who will call those ?
I however don't care enough to block this, so
Quoted 193 lines
Documentation/media/uapi/v4l/vidioc-querycap.rst +1
-0+ See :ref:`media_controller`. * - ``V4L2_CAP_DEVICE_CAPS`` - 0x80000000 - The driver fills the ``device_caps`` field. This capability canDocumentation/media/videodev2.h.rst.exceptions +1
-0@@ -176,6 +176,7 @@ replace define V4L2_CAP_STREAMING device-capabilities replace define V4L2_CAP_META_OUTPUT device-capabilities replace define V4L2_CAP_DEVICE_CAPS device-capabilities replace define V4L2_CAP_TOUCH device-capabilities +replace define V4L2_CAP_IO_MC device-capabilities # V4L2 pix flags replace define V4L2_PIX_FMT_PRIV_MAGIC :c:type:`v4l2_pix_format`drivers/media/v4l2-core/v4l2-dev.c +19
-6@@ -552,6 +552,7 @@ static void determine_valid_ioctls(struct video_device *vdev) (vdev->device_caps & meta_caps);bool is_rx = vdev->vfl_dir !=VFL_DIR_TX ;bool is_tx = vdev->vfl_dir !=VFL_DIR_RX ; +bool is_io_mc = vdev->device_caps &V4L2_CAP_IO_MC ;bitmap_zero (valid_ioctls,BASE_VIDIOC_PRIVATE );@@ -725,9 +726,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_G_STD , vidioc_g_std);if (is_rx) {SET_VALID_IOCTL (ops,VIDIOC_QUERYSTD , vidioc_querystd); -SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); -SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); -SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMINPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_INPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_INPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMINPUT , vidioc_enum_input); +SET_VALID_IOCTL (ops,VIDIOC_G_INPUT , vidioc_g_input); +SET_VALID_IOCTL (ops,VIDIOC_S_INPUT , vidioc_s_input); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDIO , vidioc_enumaudio);SET_VALID_IOCTL (ops,VIDIOC_G_AUDIO , vidioc_g_audio);SET_VALID_IOCTL (ops,VIDIOC_S_AUDIO , vidioc_s_audio);@@ -735,9 +742,15 @@ static void determine_valid_ioctls(struct video_device *vdev)SET_VALID_IOCTL (ops,VIDIOC_S_EDID , vidioc_s_edid); }if (is_tx) { -SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); -SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); -SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); +if (is_io_mc) { +set_bit (_IOC_NR (VIDIOC_ENUMOUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_G_OUTPUT ), valid_ioctls); +set_bit (_IOC_NR (VIDIOC_S_OUTPUT ), valid_ioctls); + }else { +SET_VALID_IOCTL (ops,VIDIOC_ENUMOUTPUT , vidioc_enum_output); +SET_VALID_IOCTL (ops,VIDIOC_G_OUTPUT , vidioc_g_output); +SET_VALID_IOCTL (ops,VIDIOC_S_OUTPUT , vidioc_s_output); + }SET_VALID_IOCTL (ops,VIDIOC_ENUMAUDOUT , vidioc_enumaudout);SET_VALID_IOCTL (ops,VIDIOC_G_AUDOUT , vidioc_g_audout);SET_VALID_IOCTL (ops,VIDIOC_S_AUDOUT , vidioc_s_audout);drivers/media/v4l2-core/v4l2-ioctl.c +53
-4@@ -1085,6 +1085,32 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,return ret; } +static int v4l_g_input (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_input (file, fh, arg); +} + +static int v4l_g_output (const struct v4l2_ioctl_ops *ops, +struct file *file,void *fh,void *arg) +{ +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) { + *(unsigned int *)arg =0 ; +return 0 ; + } + +return ops->vidioc_g_output (file, fh, arg); +} +static int v4l_s_input (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) {@@ -1094,12 +1120,21 @@ static int v4l_s_input(const struct v4l2_ioctl_ops *ops, ret =v4l_enable_media_source (vfd);if (ret)return ret; + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ; +return ops->vidioc_s_input (file, fh, *(unsigned int *)arg); }static int v4l_s_output (const struct v4l2_ioctl_ops *ops,struct file *file,void *fh,void *arg) { +struct video_device *vfd =video_devdata (file); + +if (vfd->device_caps &V4L2_CAP_IO_MC ) +return *(unsigned int *)arg ? -EINVAL :0 ; +return ops->vidioc_s_output (file, fh, *(unsigned int *)arg); }@@ -1143,6 +1178,14 @@ static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_IN_CAP_STD ; +if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_INPUT_TYPE_CAMERA ; +return 0 ; + } +return ops->vidioc_enum_input (file, fh, p); }@@ -1161,6 +1204,14 @@ static int v4l_enumoutput(const struct v4l2_ioctl_ops *ops,if (is_valid_ioctl (vfd,VIDIOC_S_STD )) p->capabilities |=V4L2_OUT_CAP_STD ; +if (vfd->device_caps &V4L2_CAP_IO_MC ) { +if (p->index) +return -EINVAL ; +strscpy (p->name, vfd->name,sizeof (p->name)); + p->type =V4L2_OUTPUT_TYPE_ANALOG ; +return 0 ; + } +return ops->vidioc_enum_output (file, fh, p); }@@ -2678,10 +2729,8 @@ DEFINE_V4L_STUB_FUNC(expbuf) DEFINE_V4L_STUB_FUNC(g_std) DEFINE_V4L_STUB_FUNC(g_audio) DEFINE_V4L_STUB_FUNC(s_audio) -DEFINE_V4L_STUB_FUNC(g_input) DEFINE_V4L_STUB_FUNC(g_edid) DEFINE_V4L_STUB_FUNC(s_edid) -DEFINE_V4L_STUB_FUNC(g_output) DEFINE_V4L_STUB_FUNC(g_audout) DEFINE_V4L_STUB_FUNC(s_audout) DEFINE_V4L_STUB_FUNC(g_jpegcomp)@@ -2730,11 +2779,11 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {IOCTL_INFO (VIDIOC_S_AUDIO , v4l_stub_s_audio, v4l_print_audio,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_QUERYCTRL , v4l_queryctrl, v4l_print_queryctrl,INFO_FL_CTRL |INFO_FL_CLEAR (v4l2_queryctrl, id)),IOCTL_INFO (VIDIOC_QUERYMENU , v4l_querymenu, v4l_print_querymenu,INFO_FL_CTRL |INFO_FL_CLEAR (v4l2_querymenu, index)), -IOCTL_INFO (VIDIOC_G_INPUT , v4l_stub_g_input, v4l_print_u32,0 ), +IOCTL_INFO (VIDIOC_G_INPUT , v4l_g_input, v4l_print_u32,0 ),IOCTL_INFO (VIDIOC_S_INPUT , v4l_s_input, v4l_print_u32,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_G_EDID , v4l_stub_g_edid, v4l_print_edid,INFO_FL_ALWAYS_COPY ),IOCTL_INFO (VIDIOC_S_EDID , v4l_stub_s_edid, v4l_print_edid,INFO_FL_PRIO |INFO_FL_ALWAYS_COPY ), -IOCTL_INFO (VIDIOC_G_OUTPUT , v4l_stub_g_output, v4l_print_u32,0 ), +IOCTL_INFO (VIDIOC_G_OUTPUT , v4l_g_output, v4l_print_u32,0 ),IOCTL_INFO (VIDIOC_S_OUTPUT , v4l_s_output, v4l_print_u32,INFO_FL_PRIO ),IOCTL_INFO (VIDIOC_ENUMOUTPUT , v4l_enumoutput, v4l_print_enumoutput,INFO_FL_CLEAR (v4l2_output, index)), IOCTL_INFO(VIDIOC_G_AUDOUT, v4l_stub_g_audout, v4l_print_audioout, 0),include/uapi/linux/videodev2.h +2
-0@@ -487,6 +487,8 @@ struct v4l2_capability {#define V4L2_CAP_TOUCH 0x10000000/* Is a touch device */ +#define V4L2_CAP_IO_MC 0x20000000/* Is input/output controlled by the media controller */ +#define V4L2_CAP_DEVICE_CAPS 0x80000000/* sets device capabilities field */ /*
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v4 2/3 rcar-vin: Make use of V4L2_CAP_IO_MC
In reply to Niklas SöderlundFrom: Niklas Söderlund <[email protected]>
Set the V4L2_CAP_IO_MC capability flag and remove the driver specific vidioc_enum_input, vidioc_g_input and vidioc_s_input callbacks for the media controller enabled part of the driver.
--- drivers/media/platform/rcar-vin/rcar-v4l2.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/media/platform/rcar-vin/rcar-v4l2.c +1 -16
@@ -767,18 +767,6 @@ static int rvin_mc_s_fmt_vid_cap(struct file *file, void *priv,return 0 ; } -static int rvin_mc_enum_input (struct file *file,void *priv, -struct v4l2_input *i) -{ -if (i->index !=0 ) -return -EINVAL ; - - i->type =V4L2_INPUT_TYPE_CAMERA ; -strscpy (i->name,"Camera" ,sizeof (i->name)); - -return 0 ; -} -static const struct v4l2_ioctl_ops rvin_mc_ioctl_ops = { .vidioc_querycap = rvin_querycap, .vidioc_try_fmt_vid_cap = rvin_mc_try_fmt_vid_cap,
@@ -786,10 +774,6 @@ static const struct v4l2_ioctl_ops rvin_mc_ioctl_ops = { .vidioc_s_fmt_vid_cap = rvin_mc_s_fmt_vid_cap, .vidioc_enum_fmt_vid_cap = rvin_enum_fmt_vid_cap, - .vidioc_enum_input = rvin_mc_enum_input, - .vidioc_g_input = rvin_g_input, - .vidioc_s_input = rvin_s_input, - .vidioc_reqbufs = vb2_ioctl_reqbufs, .vidioc_create_bufs = vb2_ioctl_create_bufs, .vidioc_querybuf = vb2_ioctl_querybuf,
@@ -961,6 +945,7 @@ int rvin_v4l2_register(struct rvin_dev *vin) vin->format.colorspace =RVIN_DEFAULT_COLORSPACE ;if (vin->info->use_mc) { + vdev->device_caps |=V4L2_CAP_IO_MC ; vdev->ioctl_ops = &rvin_mc_ioctl_ops; }else { vdev->ioctl_ops = &rvin_ioctl_ops;
Signature · 1 line
2.25.1
Re: [PATCH v4 2/3] rcar-vin: Make use of V4L2_CAP_IO_MC
Hi Niklas,
Thank you for the patch.
Quoted 7 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Set the
V4L2_CAP_IO_MCcapability flag and remove the driver specificvidioc_enum_input,vidioc_g_inputandvidioc_s_inputcallbacks for the media controller enabled part of the driver.Signed-off-by Niklas Söderlund <[email protected]>
Quoted 46 lines
--- drivers/media/platform/rcar-vin/rcar-v4l2.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)drivers/media/platform/rcar-vin/rcar-v4l2.c +1
-16@@ -767,18 +767,6 @@ static int rvin_mc_s_fmt_vid_cap(struct file *file, void *priv,return 0 ; } -static int rvin_mc_enum_input (struct file *file,void *priv, -struct v4l2_input *i) -{ -if (i->index !=0 ) -return -EINVAL ; - - i->type =V4L2_INPUT_TYPE_CAMERA ; -strscpy (i->name,"Camera" ,sizeof (i->name)); - -return 0 ; -} -static const struct v4l2_ioctl_ops rvin_mc_ioctl_ops = { .vidioc_querycap = rvin_querycap, .vidioc_try_fmt_vid_cap = rvin_mc_try_fmt_vid_cap,@@ -786,10 +774,6 @@ static const struct v4l2_ioctl_ops rvin_mc_ioctl_ops = { .vidioc_s_fmt_vid_cap = rvin_mc_s_fmt_vid_cap, .vidioc_enum_fmt_vid_cap = rvin_enum_fmt_vid_cap, - .vidioc_enum_input = rvin_mc_enum_input, - .vidioc_g_input = rvin_g_input, - .vidioc_s_input = rvin_s_input, - .vidioc_reqbufs = vb2_ioctl_reqbufs, .vidioc_create_bufs = vb2_ioctl_create_bufs, .vidioc_querybuf = vb2_ioctl_querybuf,@@ -961,6 +945,7 @@ int rvin_v4l2_register(struct rvin_dev *vin) vin->format.colorspace =RVIN_DEFAULT_COLORSPACE ;if (vin->info->use_mc) { + vdev->device_caps |=V4L2_CAP_IO_MC ; vdev->ioctl_ops = &rvin_mc_ioctl_ops; }else { vdev->ioctl_ops = &rvin_ioctl_ops;
Signature · 3 lines
Regards, Laurent Pinchart
PATCH v4 3/3 staging/intel-ipu3: Make use of V4L2_CAP_IO_MC
In reply to Niklas SöderlundFrom: Niklas Söderlund <[email protected]>
Set the V4L2_CAP_IO_MC capability flag and remove the driver specific vidioc_enum_{input,output}, vidioc_g_{input,output} and vidioc_s_{input,output} callbacks.
--- drivers/staging/media/ipu3/ipu3-v4l2.c | 60 +------------------------- 1 file changed, 2 insertions(+), 58 deletions(-)
drivers/staging/media/ipu3/ipu3-v4l2.c +2 -58
@@ -845,54 +845,6 @@ static int imgu_vidioc_g_meta_fmt(struct file *file, void *fh,return 0 ; } -static int imgu_vidioc_enum_input (struct file *file,void *fh, -struct v4l2_input *input) -{ -if (input->index >0 ) -return -EINVAL ; -strscpy (input->name,"camera" ,sizeof (input->name)); - input->type =V4L2_INPUT_TYPE_CAMERA ; - -return 0 ; -} - -static int imgu_vidioc_g_input (struct file *file,void *fh,unsigned int *input) -{ - *input =0 ; - -return 0 ; -} - -static int imgu_vidioc_s_input (struct file *file,void *fh,unsigned int input) -{ -return input ==0 ?0 : -EINVAL ; -} - -static int imgu_vidioc_enum_output (struct file *file,void *fh, -struct v4l2_output *output) -{ -if (output->index >0 ) -return -EINVAL ; -strscpy (output->name,"camera" ,sizeof (output->name)); - output->type =V4L2_INPUT_TYPE_CAMERA ; - -return 0 ; -} - -static int imgu_vidioc_g_output (struct file *file,void *fh, -unsigned int *output) -{ - *output =0 ; - -return 0 ; -} - -static int imgu_vidioc_s_output (struct file *file,void *fh, -unsigned int output) -{ -return output ==0 ?0 : -EINVAL ; -} -/******************** function pointers ********************/ static struct v4l2_subdev_internal_ops imgu_subdev_internal_ops = {
@@ -965,14 +917,6 @@ static const struct v4l2_ioctl_ops imgu_v4l2_ioctl_ops = { .vidioc_s_fmt_vid_out_mplane = imgu_vidioc_s_fmt, .vidioc_try_fmt_vid_out_mplane = imgu_vidioc_try_fmt, - .vidioc_enum_output = imgu_vidioc_enum_output, - .vidioc_g_output = imgu_vidioc_g_output, - .vidioc_s_output = imgu_vidioc_s_output, - - .vidioc_enum_input = imgu_vidioc_enum_input, - .vidioc_g_input = imgu_vidioc_g_input, - .vidioc_s_input = imgu_vidioc_s_input, -/* buffer queue management */ .vidioc_reqbufs = vb2_ioctl_reqbufs, .vidioc_create_bufs = vb2_ioctl_create_bufs,
@@ -1062,7 +1006,7 @@ static void imgu_node_to_v4l2(u32 node, struct video_device *vdev,switch (node) {case IMGU_NODE_IN : - cap =V4L2_CAP_VIDEO_OUTPUT_MPLANE ; + cap =V4L2_CAP_VIDEO_OUTPUT_MPLANE |V4L2_CAP_IO_MC ; f->type =V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ; vdev->ioctl_ops = &imgu_v4l2_ioctl_ops;break ;
@@ -1081,7 +1025,7 @@ static void imgu_node_to_v4l2(u32 node, struct video_device *vdev,imgu_css_meta_fmt_set (&f->fmt.meta);break ;default : - cap =V4L2_CAP_VIDEO_CAPTURE_MPLANE ; + cap =V4L2_CAP_VIDEO_CAPTURE_MPLANE |V4L2_CAP_IO_MC ; f->type =V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ; vdev->ioctl_ops = &imgu_v4l2_ioctl_ops; }
Signature · 1 line
2.25.1
Re: [PATCH v4 3/3] staging/intel-ipu3: Make use of V4L2_CAP_IO_MC
Hi Niklas,
Quoted 95 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Set the
V4L2_CAP_IO_MCcapability flag and remove the driver specific vidioc_enum_{input,output}, vidioc_g_{input,output} and vidioc_s_{input,output} callbacks.Signed-off-by Niklas Söderlund <[email protected]>--- drivers/staging/media/ipu3/ipu3-v4l2.c | 60 +------------------------- 1 file changed, 2 insertions(+), 58 deletions(-)drivers/staging/media/ipu3/ipu3-v4l2.c +1
-57@@ -845,54 +845,6 @@ static int imgu_vidioc_g_meta_fmt(struct file *file, void *fh,return 0 ; } -static int imgu_vidioc_enum_input (struct file *file,void *fh, -struct v4l2_input *input) -{ -if (input->index >0 ) -return -EINVAL ; -strscpy (input->name,"camera" ,sizeof (input->name)); - input->type =V4L2_INPUT_TYPE_CAMERA ; - -return 0 ; -} - -static int imgu_vidioc_g_input (struct file *file,void *fh,unsigned int *input) -{ - *input =0 ; - -return 0 ; -} - -static int imgu_vidioc_s_input (struct file *file,void *fh,unsigned int input) -{ -return input ==0 ?0 : -EINVAL ; -} - -static int imgu_vidioc_enum_output (struct file *file,void *fh, -struct v4l2_output *output) -{ -if (output->index >0 ) -return -EINVAL ; -strscpy (output->name,"camera" ,sizeof (output->name)); - output->type =V4L2_INPUT_TYPE_CAMERA ; - -return 0 ; -} - -static int imgu_vidioc_g_output (struct file *file,void *fh, -unsigned int *output) -{ - *output =0 ; - -return 0 ; -} - -static int imgu_vidioc_s_output (struct file *file,void *fh, -unsigned int output) -{ -return output ==0 ?0 : -EINVAL ; -} -/******************** function pointers ********************/ static struct v4l2_subdev_internal_ops imgu_subdev_internal_ops = {@@ -965,14 +917,6 @@ static const struct v4l2_ioctl_ops imgu_v4l2_ioctl_ops = { .vidioc_s_fmt_vid_out_mplane = imgu_vidioc_s_fmt, .vidioc_try_fmt_vid_out_mplane = imgu_vidioc_try_fmt, - .vidioc_enum_output = imgu_vidioc_enum_output, - .vidioc_g_output = imgu_vidioc_g_output, - .vidioc_s_output = imgu_vidioc_s_output, - - .vidioc_enum_input = imgu_vidioc_enum_input, - .vidioc_g_input = imgu_vidioc_g_input, - .vidioc_s_input = imgu_vidioc_s_input, -/* buffer queue management */ .vidioc_reqbufs = vb2_ioctl_reqbufs, .vidioc_create_bufs = vb2_ioctl_create_bufs,@@ -1062,7 +1006,7 @@ static void imgu_node_to_v4l2(u32 node, struct video_device *vdev,switch (node) {case IMGU_NODE_IN : - cap =V4L2_CAP_VIDEO_OUTPUT_MPLANE ; + cap =V4L2_CAP_VIDEO_OUTPUT_MPLANE |V4L2_CAP_IO_MC ; f->type =V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ; vdev->ioctl_ops = &imgu_v4l2_ioctl_ops;break ;
drivers/staging/media/ipu3/ipu3-v4l2.c static void imgu_node_to_v4l2(u32 node, struct video_device *vdev, · line 1028
Quoted 5 lines
drivers/staging/media/ipu3/ipu3-v4l2.c +1
-1@@ -1081,7 +1025,7 @@ static void imgu_node_to_v4l2(u32 node, struct video_device *vdev,imgu_css_meta_fmt_set (&f->fmt.meta);break ;default : - cap =V4L2_CAP_VIDEO_CAPTURE_MPLANE ; + cap =V4L2_CAP_VIDEO_CAPTURE_MPLANE |V4L2_CAP_IO_MC ;
So here, you'd add V4L2_CAP_IO_MC to all kinds of nodes.
With that,
Quoted 3 lines
drivers/staging/media/ipu3/ipu3-v4l2.c +0
-0f->type =V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ; vdev->ioctl_ops = &imgu_v4l2_ioctl_ops; }
Signature · 1 line
Sakari Ailus
Laurent Pinchart
Reviewed-byRe: [PATCH v4 3/3] staging/intel-ipu3: Make use of V4L2_CAP_IO_MC
Hello,
Quoted 104 lines · Sakari Ailus
Quoted 95 lines · Niklas Söderlund
From: Niklas Söderlund <[email protected]>
Set the
V4L2_CAP_IO_MCcapability flag and remove the driver specific vidioc_enum_{input,output}, vidioc_g_{input,output} and vidioc_s_{input,output} callbacks.Signed-off-by Niklas Söderlund <[email protected]>--- drivers/staging/media/ipu3/ipu3-v4l2.c | 60 +------------------------- 1 file changed, 2 insertions(+), 58 deletions(-)drivers/staging/media/ipu3/ipu3-v4l2.c +1
-57@@ -845,54 +845,6 @@ static int imgu_vidioc_g_meta_fmt(struct file *file, void *fh,return 0 ; } -static int imgu_vidioc_enum_input (struct file *file,void *fh, -struct v4l2_input *input) -{ -if (input->index >0 ) -return -EINVAL ; -strscpy (input->name,"camera" ,sizeof (input->name)); - input->type =V4L2_INPUT_TYPE_CAMERA ; - -return 0 ; -} - -static int imgu_vidioc_g_input (struct file *file,void *fh,unsigned int *input) -{ - *input =0 ; - -return 0 ; -} - -static int imgu_vidioc_s_input (struct file *file,void *fh,unsigned int input) -{ -return input ==0 ?0 : -EINVAL ; -} - -static int imgu_vidioc_enum_output (struct file *file,void *fh, -struct v4l2_output *output) -{ -if (output->index >0 ) -return -EINVAL ; -strscpy (output->name,"camera" ,sizeof (output->name)); - output->type =V4L2_INPUT_TYPE_CAMERA ; - -return 0 ; -} - -static int imgu_vidioc_g_output (struct file *file,void *fh, -unsigned int *output) -{ - *output =0 ; - -return 0 ; -} - -static int imgu_vidioc_s_output (struct file *file,void *fh, -unsigned int output) -{ -return output ==0 ?0 : -EINVAL ; -} -/******************** function pointers ********************/ static struct v4l2_subdev_internal_ops imgu_subdev_internal_ops = {@@ -965,14 +917,6 @@ static const struct v4l2_ioctl_ops imgu_v4l2_ioctl_ops = { .vidioc_s_fmt_vid_out_mplane = imgu_vidioc_s_fmt, .vidioc_try_fmt_vid_out_mplane = imgu_vidioc_try_fmt, - .vidioc_enum_output = imgu_vidioc_enum_output, - .vidioc_g_output = imgu_vidioc_g_output, - .vidioc_s_output = imgu_vidioc_s_output, - - .vidioc_enum_input = imgu_vidioc_enum_input, - .vidioc_g_input = imgu_vidioc_g_input, - .vidioc_s_input = imgu_vidioc_s_input, -/* buffer queue management */ .vidioc_reqbufs = vb2_ioctl_reqbufs, .vidioc_create_bufs = vb2_ioctl_create_bufs,@@ -1062,7 +1006,7 @@ static void imgu_node_to_v4l2(u32 node, struct video_device *vdev,switch (node) {case IMGU_NODE_IN : - cap =V4L2_CAP_VIDEO_OUTPUT_MPLANE ; + cap =V4L2_CAP_VIDEO_OUTPUT_MPLANE |V4L2_CAP_IO_MC ; f->type =V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ; vdev->ioctl_ops = &imgu_v4l2_ioctl_ops;break ;drivers/staging/media/ipu3/ipu3-v4l2.c static void imgu_node_to_v4l2(u32 node, struct video_device *vdev, · line 1028
Quoted 5 lines
drivers/staging/media/ipu3/ipu3-v4l2.c +1
-1@@ -1081,7 +1025,7 @@ static void imgu_node_to_v4l2(u32 node, struct video_device *vdev,imgu_css_meta_fmt_set (&f->fmt.meta);break ;default : - cap =V4L2_CAP_VIDEO_CAPTURE_MPLANE ; + cap =V4L2_CAP_VIDEO_CAPTURE_MPLANE |V4L2_CAP_IO_MC ;So here, you'd add
V4L2_CAP_IO_MCto all kinds of nodes.
Quoted 3 lines
With that,
Acked-by Sakari Ailus <[email protected]>
I like that better too. With that change,
Quoted 3 lines
Quoted 3 lines
drivers/staging/media/ipu3/ipu3-v4l2.c +0
-0f->type =V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ; vdev->ioctl_ops = &imgu_v4l2_ioctl_ops; }
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 10 lines · Niklas Söderlund
Hi,
This series aims to reduce the amount of boiler plate code in video device drivers who's inputs and/or outputs are controlled by the Media Controller instead of the V4L2 API.
Patch 1/3 adds a new video device capability flag
V4L2_CAP_IO_MCwhich if set provides helper implementations for the enum inputs and outputs ioctrls freeing the video device driver from the need to implement them.
Quoted 5 lines
Patch 2/3 and 3/3 converts the R-Car VIN and Intel IPU3 drivers to use the new default handlers and capability flag and delete the now redundant boiler plate code. I'm sure more video device drivers can make use of this new flag but as I can only test on these two platforms I have limited my changes to those.
Can you add a patch that sets this for vimc as well? That's easy to test, and helps adding compliance tests for this to v4l2-compliance.
Regards,
Hans
Quoted 15 lines
Niklas Söderlund (3):
v4l2-dev/ioctl: AddV4L2_CAP_IO_MC
rcar-vin: Make use ofV4L2_CAP_IO_MC
staging/intel-ipu3: Make use ofV4L2_CAP_IO_MC.../media/uapi/v4l/vidioc-querycap.rst | 6 ++ .../media/videodev2.h.rst.exceptions | 1 + drivers/media/platform/rcar-vin/rcar-v4l2.c | 17 +----- drivers/media/v4l2-core/v4l2-dev.c | 25 ++++++-- drivers/media/v4l2-core/v4l2-ioctl.c | 57 ++++++++++++++++-- drivers/staging/media/ipu3/ipu3-v4l2.c | 60 +------------------ include/uapi/linux/videodev2.h | 2 + 7 files changed, 84 insertions(+), 84 deletions(-)