Commit 56ab8cdb authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab
Browse files

media: v4l: Add support for STD ioctls on subdev nodes 



There is no way to control the standard of subdevices which are part of
a media device. The ioctls which exists all target video devices
explicitly and the idea is that the video device should talk to the
subdevice. For subdevices part of a media graph this is not possible and
the standard must be controlled on the subdev device directly.

Add four new ioctls to be able to directly interact with subdevices and
control the video standard; VIDIOC_SUBDEV_ENUMSTD, VIDIOC_SUBDEV_G_STD,
VIDIOC_SUBDEV_S_STD and VIDIOC_SUBDEV_QUERYSTD.

Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent be9543ec

Documentation/media/uapi/v4l/vidioc-enumstd.rst

+7 −4
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 


.. _VIDIOC_ENUMSTD:



********************

ioctl VIDIOC_ENUMSTD

********************

*******************************************

ioctl VIDIOC_ENUMSTD, VIDIOC_SUBDEV_ENUMSTD

*******************************************



Name

====



VIDIOC_ENUMSTD - Enumerate supported video standards

VIDIOC_ENUMSTD - VIDIOC_SUBDEV_ENUMSTD - Enumerate supported video standards





Synopsis
@@ -18,6 +18,9 @@ Synopsis 
.. c:function:: int ioctl( int fd, VIDIOC_ENUMSTD, struct v4l2_standard *argp )

    :name: VIDIOC_ENUMSTD



.. c:function:: int ioctl( int fd, VIDIOC_SUBDEV_ENUMSTD, struct v4l2_standard *argp )

    :name: VIDIOC_SUBDEV_ENUMSTD





Arguments

=========

Documentation/media/uapi/v4l/vidioc-g-std.rst

+10 −4
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 


.. _VIDIOC_G_STD:



********************************

ioctl VIDIOC_G_STD, VIDIOC_S_STD

********************************

**************************************************************************

ioctl VIDIOC_G_STD, VIDIOC_S_STD, VIDIOC_SUBDEV_G_STD, VIDIOC_SUBDEV_S_STD

**************************************************************************



Name

====



VIDIOC_G_STD - VIDIOC_S_STD - Query or select the video standard of the current input

VIDIOC_G_STD - VIDIOC_S_STD - VIDIOC_SUBDEV_G_STD - VIDIOC_SUBDEV_S_STD - Query or select the video standard of the current input





Synopsis
@@ -21,6 +21,12 @@ Synopsis 
.. c:function:: int ioctl( int fd, VIDIOC_S_STD, const v4l2_std_id *argp )

    :name: VIDIOC_S_STD



.. c:function:: int ioctl( int fd, VIDIOC_SUBDEV_G_STD, v4l2_std_id *argp )

    :name: VIDIOC_SUBDEV_G_STD



.. c:function:: int ioctl( int fd, VIDIOC_SUBDEV_S_STD, const v4l2_std_id *argp )

    :name: VIDIOC_SUBDEV_S_STD





Arguments

=========

Documentation/media/uapi/v4l/vidioc-querystd.rst

+7 −4
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ 


.. _VIDIOC_QUERYSTD:



*********************

ioctl VIDIOC_QUERYSTD

*********************

*********************************************

ioctl VIDIOC_QUERYSTD, VIDIOC_SUBDEV_QUERYSTD

*********************************************



Name

====



VIDIOC_QUERYSTD - Sense the video standard received by the current input

VIDIOC_QUERYSTD - VIDIOC_SUBDEV_QUERYSTD - Sense the video standard received by the current input





Synopsis
@@ -18,6 +18,9 @@ Synopsis 
.. c:function:: int ioctl( int fd, VIDIOC_QUERYSTD, v4l2_std_id *argp )

    :name: VIDIOC_QUERYSTD



.. c:function:: int ioctl( int fd, VIDIOC_SUBDEV_QUERYSTD, v4l2_std_id *argp )

    :name: VIDIOC_SUBDEV_QUERYSTD





Arguments

=========

drivers/media/v4l2-core/v4l2-subdev.c

+22 −0
Original line number Diff line number Diff line
@@ -494,6 +494,28 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 


	case VIDIOC_SUBDEV_S_DV_TIMINGS:

		return v4l2_subdev_call(sd, video, s_dv_timings, arg);



	case VIDIOC_SUBDEV_G_STD:

		return v4l2_subdev_call(sd, video, g_std, arg);



	case VIDIOC_SUBDEV_S_STD: {

		v4l2_std_id *std = arg;



		return v4l2_subdev_call(sd, video, s_std, *std);

	}



	case VIDIOC_SUBDEV_ENUMSTD: {

		struct v4l2_standard *p = arg;

		v4l2_std_id id;



		if (v4l2_subdev_call(sd, video, g_tvnorms, &id))

			return -EINVAL;



		return v4l_video_std_enumstd(p, id);

	}



	case VIDIOC_SUBDEV_QUERYSTD:

		return v4l2_subdev_call(sd, video, querystd, arg);

#endif

	default:

		return v4l2_subdev_call(sd, core, ioctl, cmd, arg);

include/uapi/linux/v4l2-subdev.h

+4 −0
Original line number Diff line number Diff line
@@ -170,8 +170,12 @@ struct v4l2_subdev_selection { 
#define VIDIOC_SUBDEV_G_SELECTION		_IOWR('V', 61, struct v4l2_subdev_selection)

#define VIDIOC_SUBDEV_S_SELECTION		_IOWR('V', 62, struct v4l2_subdev_selection)

/* The following ioctls are identical to the ioctls in videodev2.h */

#define VIDIOC_SUBDEV_G_STD			_IOR('V', 23, v4l2_std_id)

#define VIDIOC_SUBDEV_S_STD			_IOW('V', 24, v4l2_std_id)

#define VIDIOC_SUBDEV_ENUMSTD			_IOWR('V', 25, struct v4l2_standard)

#define VIDIOC_SUBDEV_G_EDID			_IOWR('V', 40, struct v4l2_edid)

#define VIDIOC_SUBDEV_S_EDID			_IOWR('V', 41, struct v4l2_edid)

#define VIDIOC_SUBDEV_QUERYSTD			_IOR('V', 63, v4l2_std_id)

#define VIDIOC_SUBDEV_S_DV_TIMINGS		_IOWR('V', 87, struct v4l2_dv_timings)

#define VIDIOC_SUBDEV_G_DV_TIMINGS		_IOWR('V', 88, struct v4l2_dv_timings)

#define VIDIOC_SUBDEV_ENUM_DV_TIMINGS		_IOWR('V', 98, struct v4l2_enum_dv_timings)

CRA Git | Maintained and supported by SUSTech CRA and CCSE