mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

[media] v4l: Add pad-level DV timings subdev operations

Browse source 
The dv_timings_cap and enum_dv_timings subdev operations are implemented
at the device level, but apply to pads. Create new variants of those
operations at the pad level. The device level variants will be removed
once all drivers are ported to the pad level DT timings operations.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Laurent Pinchart 2014-01-29 10:05:10 -03:00 committed by Mauro Carvalho Chehab
parent 523d63eb67
commit 0349f6a5f1
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/media/v4l2-subdev.h
View file

@ -517,6 +517,10 @@ struct v4l2_subdev_pad_ops {
struct v4l2_subdev_selection *sel); struct v4l2_subdev_selection *sel);
int (*get_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid); int (*get_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid);
int (*set_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid); int (*set_edid)(struct v4l2_subdev *sd, struct v4l2_edid *edid);
int (*dv_timings_cap)(struct v4l2_subdev *sd,
struct v4l2_dv_timings_cap *cap);
int (*enum_dv_timings)(struct v4l2_subdev *sd,
struct v4l2_enum_dv_timings *timings);
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
int (*link_validate)(struct v4l2_subdev *sd, struct media_link *link, int (*link_validate)(struct v4l2_subdev *sd, struct media_link *link,
struct v4l2_subdev_format *source_fmt, struct v4l2_subdev_format *source_fmt,

10
include/uapi/linux/videodev2.h
View file

@ -1106,12 +1106,15 @@ struct v4l2_dv_timings {
/** struct v4l2_enum_dv_timings - DV timings enumeration /** struct v4l2_enum_dv_timings - DV timings enumeration
* @index: enumeration index * @index: enumeration index
* @pad: the pad number for which to enumerate timings (used with
* v4l-subdev nodes only)
* @reserved: must be zeroed * @reserved: must be zeroed
* @timings: the timings for the given index * @timings: the timings for the given index
*/ */
struct v4l2_enum_dv_timings { struct v4l2_enum_dv_timings {
__u32 index; __u32 index;
__u32 reserved[3]; __u32 pad;
__u32 reserved[2];
struct v4l2_dv_timings timings; struct v4l2_dv_timings timings;
}; };
@ -1149,11 +1152,14 @@ struct v4l2_bt_timings_cap {
/** struct v4l2_dv_timings_cap - DV timings capabilities /** struct v4l2_dv_timings_cap - DV timings capabilities
* @type: the type of the timings (same as in struct v4l2_dv_timings) * @type: the type of the timings (same as in struct v4l2_dv_timings)
* @pad: the pad number for which to query capabilities (used with
* v4l-subdev nodes only)
* @bt: the BT656/1120 timings capabilities * @bt: the BT656/1120 timings capabilities
*/ */
struct v4l2_dv_timings_cap { struct v4l2_dv_timings_cap {
__u32 type; __u32 type;
__u32 reserved[3]; __u32 pad;
__u32 reserved[2];
union { union {
struct v4l2_bt_timings_cap bt; struct v4l2_bt_timings_cap bt;
__u32 raw_data[32]; __u32 raw_data[32];