Em Thu, 17 Apr 2014 16:12:36 +0200
Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> escreveu:
> Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Acked-by: Lad, Prabhakar <prabhakar.csengg@xxxxxxxxx>
> Reviewed-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> ---
> include/media/v4l2-subdev.h | 4 ++++
> include/uapi/linux/videodev2.h | 10 ++++++++--
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
> index ee1cb2d..341ca4d 100644
> --- a/include/media/v4l2-subdev.h
> +++ b/include/media/v4l2-subdev.h
> @@ -510,6 +510,10 @@ struct v4l2_subdev_pad_ops {
> struct v4l2_subdev_selection *sel);
> int (*get_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
> int (*link_validate)(struct v4l2_subdev *sd, struct media_link *link,
> struct v4l2_subdev_format *source_fmt,
> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> index ea468ee..8e5077e 100644
> --- a/include/uapi/linux/videodev2.h
> +++ b/include/uapi/linux/videodev2.h
> @@ -1107,12 +1107,15 @@ struct v4l2_dv_timings {
>
> /** struct v4l2_enum_dv_timings - DV timings enumeration
> * @index: enumeration index
> + * @pad: the pad number for which to enumerate timings (used with
> + * v4l-subdev nodes only)
> * @reserved: must be zeroed
> * @timings: the timings for the given index
> */
> struct v4l2_enum_dv_timings {
> __u32 index;
> - __u32 reserved[3];
> + __u32 pad;
> + __u32 reserved[2];
> struct v4l2_dv_timings timings;
> };
>
> @@ -1150,11 +1153,14 @@ struct v4l2_bt_timings_cap {
>
> /** struct v4l2_dv_timings_cap - DV timings capabilities
> * @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
> */
> struct v4l2_dv_timings_cap {
> __u32 type;
> - __u32 reserved[3];
> + __u32 pad;
Please document its usage at the media DocBook.
> + __u32 reserved[2];
> union {
> struct v4l2_bt_timings_cap bt;
> __u32 raw_data[32];
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
